Commit Graph

398 Commits

Author SHA1 Message Date
James Lyne
6aa9aaf2bd Only set config hash if present in update response
Prevents infinite reloading if the update response doesn't contain a hash for some reason
2021-08-03 02:26:43 +01:00
James Lyne
eba8a5b7e1 Fix incorrect player head URL (Fixes #2) 2021-08-02 17:12:29 +01:00
James Lyne
b143fc1561 Player list heading fixes 2021-07-29 19:16:37 +01:00
James Lyne
f4aca39975 Fix incorrect Dynmap player head URL generation 2021-07-29 19:05:33 +01:00
James Lyne
2ff16c81ed Merge remote-tracking branch 'origin/master' 2021-07-29 18:20:05 +01:00
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
James Lyne
38946d7015 Initial pl3xmap support 2021-07-29 18:06:19 +01:00
James Lyne
a7fa366635 Create marker labels lazily when showLabels is false 2021-07-29 17:46:11 +01:00
James Lyne
f5002ed828
Fix URL zoom being ignored on initial load (Fixes #59) 2021-07-29 14:14:01 +01:00
James Lyne
02c705de36 Fix build errors 2021-07-29 03:39:28 +01:00
James Lyne
90ec2080ee Add tooltip support 2021-07-29 03:06:05 +01:00
James Lyne
d05b7a63ac Use playerMarkers.layerName for the layer name 2021-07-29 00:34:40 +01:00
James Lyne
ee8607ed6d Fix player layer duplicating in some situations 2021-07-29 00:34:18 +01:00
James Lyne
8151dfaab5 Make followZoom optional 2021-07-28 23:52:51 +01:00
James Lyne
b3f186a197 Move grayHiddenPlayers to playerMarkers component 2021-07-28 23:52:03 +01:00
James Lyne
7bff12b729 Move maxPlayers to separate field in store, add mutation 2021-07-28 23:50:59 +01:00
James Lyne
4feb46c641 Move player count/max into playersHeading 2021-07-28 22:27:43 +01:00
James Lyne
4350fae1d5 Fix uuid handling in player map 2021-07-28 22:17:02 +01:00
James Lyne
110c75f9a3 Allow partial updates of component settings 2021-07-28 22:16:26 +01:00
James Lyne
d04226e3ec Refactor popup handling
- Merge label and popupContent properties for vector layers, as only one is ever used
- Move common vector methods to separate file and remove duplicates
- Rename isHTML properties to be clearer
2021-07-28 17:49:38 +01:00
James Lyne
2a216dd4e8 Path performance improvements
- Avoid intermediate objects when creating leaflet objects to reduce allocations
- Make individual path objects non-reactive
- Avoid projecting path points twice during updates
2021-07-28 04:04:47 +01:00
James Lyne
9517de0760 Path point handling changes
- Store path points as {x,y,z} objects instead of separate arrays
- Project point objects right before layer creation
- A bit slower overall but matches the format of Pl3xmap path points.
2021-07-28 04:04:46 +01:00
James Lyne
c69aeb8f5f Make map definitions non-reactive to improve projection performance 2021-07-27 04:31:43 +01:00
James Lyne
42f8cbd74b Show maps button if there is a single map but multiple servers 2021-07-27 02:36:24 +01:00
James Lyne
d37657d3e2 Prevent unnecessary marker repositioning on world change 2021-07-27 02:28:01 +01:00
James Lyne
0aa61517dc Set the correct world object in map definitions 2021-07-26 01:05:08 +01:00
James Lyne
5cf353cd8a Update license headers 2021-07-26 01:05:08 +01:00
James Lyne
9e2caa6f63 More type renaming 2021-07-26 01:05:08 +01:00
James Lyne
5fb0a3e2f4 Move night/update handling into DynmapTileLayer 2021-07-26 01:05:07 +01:00
James Lyne
355c0c71cf Restructure LiveAtlasServerDefinition 2021-07-26 01:05:07 +01:00
James Lyne
e61d0def04 Replace serverConfig getter with MapProvider url methods 2021-07-26 01:05:07 +01:00
James Lyne
e7945b3f9a Add fields to DynmapTileLayer 2021-07-26 01:05:07 +01:00
James Lyne
e4e7dfcd5f Move fetchJSON to abstract MapProvider 2021-07-26 01:05:07 +01:00
James Lyne
ad9af04e9e Rename world/map title to displayName 2021-07-26 01:05:05 +01:00
James Lyne
c202def955 Move login from configuration to components 2021-07-26 01:04:18 +01:00
James Lyne
e46a97df15 Fix scheduledZoom/scheduledPan handling on map change 2021-07-26 01:04:18 +01:00
James Lyne
0c1ca36be1 Fix build 2021-07-26 01:04:18 +01:00
James Lyne
bc38af3254 Use generic names for more types 2021-07-26 01:04:18 +01:00
James Lyne
cba4b33e1a Refactor DynmapMapProvider.ts 2021-07-26 01:04:18 +01:00
James Lyne
e809f28455 (Re)move some config store properties 2021-07-26 01:04:18 +01:00
James Lyne
1d27e05f7c Rename DynmapPlayer to LiveAtlasPlayer, rename some fields, add uuid field 2021-07-26 01:04:18 +01:00
James Lyne
44b3a7e276 Remove updateInterval from store 2021-07-26 01:04:18 +01:00
James Lyne
33b5b305e2 Add MapProvider, move dynmap api handling to DynmapMapProvider 2021-07-26 01:04:17 +01:00
James Lyne
c99215e259 Use generic names for extended leaflet classes 2021-07-26 01:04:17 +01:00
James Lyne
ef26d78c19 Refactor map handling
- Map definitions now have their own class
- A map's projection is now a private property of the instance. Coordinates are converted via map instance methods.
- Moved map icon handling to instance getter
- Removed currentProjection and related mutations from store
- Changed currentProjection watchers to currentMap
2021-07-26 01:04:13 +01:00
James Lyne
9021c5291d Use generic names for extended leaflet classes 2021-07-23 22:28:06 +01:00
James Lyne
c7ec76767e Refactor map handling
- Map definitions now have their own class
- A map's projection is now a private property of the instance. Coordinates are converted via map instance methods.
- Moved map icon handling to instance getter
- Removed currentProjection and related mutations from store
- Changed currentProjection watchers to currentMap
2021-07-23 20:42:18 +01:00
James Lyne
b9807b3a7b Fix config validation 2021-07-22 23:18:26 +01:00
James Lyne
dd17bc63bd Avoid applying the base background colour twice to buttons in leaflet-controls 2021-07-22 23:18:18 +01:00
James Lyne
01907f22a0 Fix players button title 2021-07-22 20:47:37 +01:00