-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prepare everything for enabling slider
- Loading branch information
Showing
3 changed files
with
64 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,65 @@ | ||
| import { LargeMarkerIcon } from '@/helpers/marker' | ||
|
|
||
| export function filter_and_update(map,data,allMarkers, overlayLayers,minYear,maxYear,selectedYear) { | ||
| export function filter_and_update(map,data,overlayLayers,selectedYear) { | ||
|
|
||
| let AllMarkerLayers = new L.LayerGroup(); | ||
| selectedYear == '' ? 1900 : selectedYear; | ||
|
|
||
| console.log("Timeline: filterMarkers",selectedYear); | ||
| console.log("Timeline: allMarkers", allMarkers.length); | ||
| console.log("Timeline: overlayLayers", overlayLayers.value); | ||
| Object.keys(overlayLayers.value).forEach((layerName) => { | ||
| const layer = overlayLayers.value[layerName]; | ||
|
|
||
| if (layer instanceof L.MarkerClusterGroup) { | ||
| console.log("Timeline: layer name", layer); | ||
| console.log("Timeline: layer title", layer.options.title); | ||
|
|
||
|
|
||
|
|
||
| layer.eachLayer((marker) => { | ||
| if (marker instanceof L.Marker) { | ||
| console.log("marker.data",marker.options.data.title); | ||
| console.log("marker.data",marker.options.data.startdate); | ||
| // checkForDates(layer, marker); | ||
|
|
||
| } | ||
| }); | ||
| } | ||
| }); | ||
| return; | ||
| allMarkers.forEach(function(marker) { | ||
| if (!marker.data) { | ||
| AllMarkerLayers.removeLayer(marker); | ||
| return; | ||
| function checkForDates(layer, marker) { | ||
|
|
||
| if (!marker.data) { | ||
| layer.removeLayer(marker); | ||
| return; | ||
| } | ||
| if (marker.data.fromYear <= selectedYear && marker.data.endYear >= selectedYear) { | ||
| console.log("1", marker.data.fromYear,selectedYear,marker.data.endYear,marker.data.color, marker.data.title, marker.data.layer_id); | ||
| console.log("Timeslider marker color",marker.data.color); | ||
| // let icon = LargeMarkerIcon.create({color: marker.data.color, opacity: 0.72, mtype: marker.data.mtype }) | ||
| // marker.setIcon(icon); | ||
| marker.addTo(layer); | ||
| } | ||
| // selecting past years | ||
| else if ( marker.data.endYear <= selectedYear) { | ||
|
|
||
| console.log("X Past", marker.data.fromYear,selectedYear,marker.data.endYear,marker.data.color, marker.data.title, marker.data.layer_id); | ||
|
|
||
| layer.removeLayer(marker); | ||
| let icon = LargeMarkerIcon.create({color: '#fff', opacity: 0.72, mtype: marker.data.mtype }) | ||
| marker.setIcon(icon); | ||
| marker.addTo(layer); | ||
| // TODO: remove relations and other elements! | ||
|
|
||
| // selecting future years | ||
| } else { | ||
| console.log("X Future", marker.data.fromYear,selectedYear,marker.data.endYear,marker.data.color, marker.data.title, marker.data.layer_id); | ||
| layer.removeLayer(marker); | ||
|
|
||
| } | ||
| // Check which layers are currently visible | ||
| map.value.eachLayer((layer) => { | ||
| if (layer instanceof L.MarkerClusterGroup) { | ||
| // layer.refreshClusters(); | ||
| } | ||
| }) | ||
| } | ||
| if (marker.data.fromYear <= selectedYear && marker.data.endYear >= selectedYear) { | ||
| console.log("1", marker.data.fromYear,selectedYear,marker.data.endYear,marker.data.color, marker.data.title, marker.data.layer_id); | ||
| icon = LargeMarkerIcon.create({color: marker.data.color}); | ||
| marker.setIcon(icon); | ||
| marker.addTo(allMarkers); | ||
| } | ||
| // selecting past years | ||
| else if ( marker.data.endYear <= selectedYear) { | ||
|
|
||
| console.log("X Past", marker.data.fromYear,selectedYear,marker.data.endYear,marker.data.color, marker.data.title, marker.data.layer_id); | ||
| } | ||
|
|
||
|
|
||
| if ( $('#map').hasClass('darken-icons2') ) { | ||
| icon = LargeMarkerIcon.create({color: '#333', opacity: 0.2}); | ||
| } else if ( $('#map').hasClass('darken-icons') ) { | ||
| icon = LargeMarkerIcon.create({color: '#555', opacity: 0.2}); | ||
| } else { | ||
| icon = LargeMarkerIcon.create({color: '#fff', opacity: 0.42}); | ||
| } | ||
| // window.map.removeLayer(marker); | ||
| allMarkers.removeLayer(marker); | ||
| marker.setIcon(icon); | ||
| marker.addTo(allMarkers); | ||
| // TODO: remove relations and other elements! | ||
|
|
||
| // selecting future years | ||
| } else { | ||
| console.log("X Future", marker.data.fromYear,selectedYear,marker.data.endYear,marker.data.color, marker.data.title, marker.data.layer_id); | ||
| // window.map.removeLayer(marker); | ||
| allMarkers.removeLayer(marker); | ||
| } | ||
| }); | ||
| allMarkers.refreshClusters(); | ||
| } | ||
|
|