James Lyne e07ac55c33 Merge branch 'pl3xmap' ... # Conflicts: # src/api.ts # src/components/Map.vue # src/components/map/layer/MapLayer.vue # src/components/map/layer/MarkerSetLayer.vue # src/components/map/vector/Areas.vue # src/components/map/vector/Circles.vue # src/components/map/vector/Lines.vue # src/components/map/vector/Markers.vue # src/components/sidebar/WorldListItem.vue # src/dynmap.d.ts # src/index.d.ts # src/leaflet/icon/GenericIcon.ts # src/leaflet/layer/LiveAtlasLayerGroup.ts # src/leaflet/tileLayer/DynmapTileLayer.ts # src/leaflet/vector/LiveAtlasPolygon.ts # src/leaflet/vector/LiveAtlasPolyline.ts # src/model/LiveAtlasMapDefinition.ts # src/model/LiveAtlasProjection.ts # src/store/actions.ts # src/store/getters.ts # src/store/state.ts # src/util.ts # src/util/areas.ts # src/util/circles.ts # src/util/lines.ts # src/util/markers.ts		2021-07-29 18:15:35 +01:00
..
control	Update license headers	2021-07-26 01:05:08 +01:00
icon	Create marker labels lazily when showLabels is false	2021-07-29 17:46:11 +01:00
layer	Create marker labels lazily when showLabels is false	2021-07-29 17:46:11 +01:00
marker	Create marker labels lazily when showLabels is false	2021-07-29 17:46:11 +01:00
tileLayer	Initial pl3xmap support	2021-07-29 18:06:19 +01:00
LiveAtlasLeafletMap.ts	Update license headers	2021-07-26 01:05:08 +01:00