Add Geospatial plugin (#7406)
* Add XLSX import spec for demo real estate spreadsheets
* Fix fieldname
* Improve map pin
* RealEstate demo: Set lat, long, price fields to be numeric
* Clean up Flickr demo
* Update geomap widget to refresh properly
* Add Leaflet MasterCluster plugin
* Setup the marker cluster plugin
* Rearrange real estate demo
* Reduce default cluster radius
* Beginnings of real estate demo
* Fix interpretation of HTTP status codes
* Real estate demo: Make columns hideable
* Real estate demo: sortability
* Real estate demo: search and limit
* Fix typo
* Fix lat long transposition
* Fix startup ordering
* Add geolookup operator
* Real Estate Demo: Add support for computed columns
* Real estate demo: Increase result limit
* Remove demo data
* Track map pan and zoom state in a state tiddler
* WIP
* Use geojson extension for geojson file
* Use geojson extensions for another geojson file
* Split demo from the geospatial plugin into its own edition
* Add build targets required by ./bin/site-build.sh...
... when building the geospatial edition as the main edition, making it easier to find on Vercel
* CI Fixes
* Fix default tab
* Rearranging geospatial plugin vs. edition
* More refactoring between demo and plugin
* Start of plugin docs
* Display GeoJSON properties on click
* Fix layer lookup demo
* Restore XLSX Utils plugin and dependencies
* Cleanup docs
* Remove 5.2.8 release note
* Remove 5.2.8 release note
* Docs update
* Fix minor refreshing bug for geomap widget
* Docs updates
* Add jsonset operator
* Add geonearestpoint operator
* jsonset: support for other data types and documentation
* Add logo
* Add link to preview build
* jsonset: add support for assigning JSON strings
* Fix nonstandard initialisation code for fill/parameter/slot widgets
* Introduce testcase widget so that we can reuse testcases as documentation examples
There's still a bit to do: adding tabs to the source panel of the testcase display, and tweaking the CSS.
* Update logo
* Testcasewidget: Add tabs for switching between source tiddlers
* Testcase appearance tweaks
* Switch to fluid-fixed layout
* Docs for the testcase-transclude and testcase-view widgets
* Split docs into separate tabs
* Extend testcase-view to be able to view other fields
* Extend default testcase template to show all fields of payload tiddlers
* Add some geomap examples
* Fix testcase rounded corners
* Add a geomap layer demo
* Add favicon
* Switch from building the geospatial plugin as the main build back to tw5.com
To make it easier to get to the documentation for the new features
* Remove obsolete comment
* Remove geospatial plugin from tw5.com build
* Fix build link
* Add note about core enhancements included in this branch
* Refactor data widget implementation
To avoid code duplication
* Integrate test cases with the docs
* Remove erroneously pasted docs material
* Remove erroneously copied olc-encode tests within old-decode test case
* Refactor compound tiddler handling into data widget
And add some tests for the data widget
* Default test case template tweaks
* Move Flickr macros into geospatial plugin from the demo edition
* FlickrDemo: Simplify UI
* FlickrMacros: Use a template to define photo tiddler fields
* Remove geospatial plugin from prerelease default tiddlers
* Extend Flickr helpers to support photoTiddlerTemplate parameter
* Update modification times of doc tiddlers
So that they are at the top of the recent tab
* Update 5.3.0 release note
* Remove custom CI step for this branch
* Restore standard sitetitle
* Flickr macro docs
* Rename $:/tags/GeoLayer to $:/tags/GeoFeature
And make sure that it works with all GeoJSON features, not just polygons
* More test data (from leaflet.js)
* Captions should be transcluded, not viewed raw
* Make HTTP handler use wiki of widget that sent the message
* Switch testcase widget to use an intrinsic template
Makes things much simpler
* Complete Flickr demos
* Extend geonearestpoint operator to work with feature collections
* Extend realestate demo to show data on nearest volcano
* Flickr macros: fix pagination after first page
Make sure that the widget we create to run the actions also has access to the event handlers attached to the rootwidget.
* Real estate demo: Fix nearest volcano
* Testcase docs update
* Testcase template: put title at the top and remove header row
* Docs correction
* New geonearestpoint test case
* Make test cases editable
* Test case default template: Always put "Output" tab first
* Initial Commit
* HttpClient object shouldn't need to know about events
* Add support for cancelling HTTP requests
* Make the number of outstanding HTTP requests available in a state tiddler
* Add a network activity button
Click it to cancel outstanding requests
* WIP
* Fix typo
Thanks @btheado
Co-authored-by: btheado <brian.theado@gmail.com>
* Data widget: parse carriage returns in compound tiddlers
* Fix crash when cancelling more than one HTTP request
Thanks @saqimtiaz
* Further fixes to cancelling outstanding HTTP requests
* Don't have data widget rendering its own JSON
Making the data widget render its raw JSON (introduced in 683ec3300490714da21ef0a1e1e50d348473d868) was a bad idea as it messes up the innerwiki use of the data widget. Instead we use the testcase widget with a special template to render the raw JSON of the payload of a testcase, thus giving us a way to test the data widget
* Fix missed docs update
* Introduce geolayer widget for specifying layers for geomap
* Fix breaking tests
* Remove docs references to obsolete widgets
* Tests for geounion, geointersect and geodifference
* Support for multiple base layers
* Make the layers control visible which allows the base layer to be chosen, and individual overlay layers to be hidden
* Add tiddlers tagged $:/tags/GeoBaseLayer to define some useful map base layers
* Add geobaselayer widget to define base layers
* Add a satellite base layer and another terrain base layer
* Add a note where to get more base layers
* Docs update
* Geomap widget: fix default base layer rendering
* Add startPosition and layersPanel attributes to geomap widget
* Update geolayer widget docs with missing attributes
* Add interactive demos for geounion, geodifference, geointersection
* Open geofeature and geomarker maps on the bounds of their content
* Move settings from demo into plugin
Because now the Flickr macros are part of the plugin
* Icon for geospatial plugin
* Fix missing body
* Flickr Demo typo
* Docs update
* Add support for draggable markers
* Removed accidentally committed file
* Remove unwanted log
* Add support for tm-request-geolocation message
* Fix typo
* Fix bug when fitting to non-extistent bounds
* Update main wiki greeting
* Use "Flickr helpers" instead of "Flickr macros"
* File renames for 05d32716037dd14b8a3741b28a82235defea4701
* Fix testcase widget example
Thanks @btheado
* Fix testcase widget refreshing
* Fix failing tests from 03b6413c7a519429ea75353faf32c0a0baf2b88e
* Docs: Clarify that template must be in the payload
* Testcase widget: Exclude tab state tiddlers
See https://github.com/Jermolene/TiddlyWiki5/pull/7406#discussion_r1327971965
Thanks @btheado
* Remove obsolete setquerystring operator
Instead we have the query- parameters to the http request message
* Remove obsolete change to --setfield command
* Fix tiddler name typo
* Initial Commit
* Add note to preview build
* Fix whitespace and indenting
Thanks @pmario
* Fix crash with unset $tiddler attribute on <$data> widget
Thanks @CodaCodr
* Remove Stamen baselayers
They have stopped making them available for free - see https://maps.stamen.com/stadia-partnership/
* Disable test that won't run in browser CI
* Disable broken tests
* Update olc-encode.tid (#7885)
Correct spelling
* Don't duplicate "description" field in test cases
* Use different background colours for nested testcase widgets
* Extend the testcase widget to run tests
* Add testcases to control panel
* Add a view template body template to render testcase tiddlers
* Test edition should display testcases
* Whitespace fixes
* Make testcase tiddler tempalte link to itself
* Styling tweaks
* Docs improvements
* Styling tweaks
* Run the new tw5.com testcases in the test edition
* Update data widget to display its content in JSON
* Add testcase convenience procedure
* Clearer testcases for data widget, and docs tweaks
* Don't expect our intentionally failing test to pass
* Extend testcase default template so that the display format can be chosen
It is selected by setting the variable "displayFormat"
* DataWidget docs typo
* Mark Geospatial plugin as experimental
* Update to Leaflet v1.9.4
* Remove unneeded template
Left over from when the testcase widget was first implemented
* Don't hide the volcanoes of the world data set
* Update Flickr demo docs
* Fix subtle typo that was preventing popups from working correctly
* Go back to hiding the volcanoes of the world by default
Too much data for a small device now that the markers are displayed correctly
* Clarify docs for tm-request-location
* Update modified testcase from master
* Prepare for merging
---------
Co-authored-by: btheado <brian.theado@gmail.com>
Co-authored-by: Drevarr <drevarr@gmail.com>
2024-05-31 12:31:30 +00:00
|
|
|
/*\
|
|
|
|
title: $:/plugins/tiddlywiki/geospatial/geomap.js
|
|
|
|
type: application/javascript
|
|
|
|
module-type: widget
|
|
|
|
|
|
|
|
Leaflet map widget
|
|
|
|
|
|
|
|
\*/
|
|
|
|
(function(){
|
|
|
|
|
|
|
|
/*jslint node: true, browser: true */
|
|
|
|
/*global $tw: false */
|
|
|
|
"use strict";
|
|
|
|
|
|
|
|
var Widget = require("$:/core/modules/widgets/widget.js").widget;
|
|
|
|
|
|
|
|
var GeomapWidget = function(parseTreeNode,options) {
|
|
|
|
this.initialise(parseTreeNode,options);
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
Inherit from the base widget class
|
|
|
|
*/
|
|
|
|
GeomapWidget.prototype = new Widget();
|
|
|
|
|
|
|
|
/*
|
|
|
|
Render this widget into the DOM
|
|
|
|
*/
|
|
|
|
GeomapWidget.prototype.render = function(parent,nextSibling) {
|
|
|
|
// Housekeeping
|
|
|
|
this.parentDomNode = parent;
|
|
|
|
this.computeAttributes();
|
|
|
|
this.execute();
|
|
|
|
// Render the children into a hidden DOM node
|
|
|
|
var parser = {
|
|
|
|
tree: [{
|
|
|
|
type: "widget",
|
|
|
|
attributes: {},
|
|
|
|
orderedAttributes: [],
|
|
|
|
children: this.parseTreeNode.children || []
|
|
|
|
}]
|
|
|
|
};
|
|
|
|
this.contentRoot = this.wiki.makeWidget(parser,{
|
|
|
|
document: $tw.fakeDocument,
|
|
|
|
parentWidget: this
|
|
|
|
});
|
|
|
|
this.contentContainer = $tw.fakeDocument.createElement("div");
|
|
|
|
this.contentRoot.render(this.contentContainer,null);
|
|
|
|
// Render a wrapper for the map
|
|
|
|
this.domNode = this.document.createElement("div");
|
|
|
|
this.domNode.style.width = "100%";
|
|
|
|
this.domNode.style.height = "600px";
|
|
|
|
// Insert it into the DOM
|
|
|
|
parent.insertBefore(this.domNode,nextSibling);
|
|
|
|
this.domNodes.push(this.domNode);
|
|
|
|
// Render the map
|
2024-06-18 14:50:15 +00:00
|
|
|
if($tw.browser && !this.domNode.isTiddlyWikiFakeDom) {
|
Add Geospatial plugin (#7406)
* Add XLSX import spec for demo real estate spreadsheets
* Fix fieldname
* Improve map pin
* RealEstate demo: Set lat, long, price fields to be numeric
* Clean up Flickr demo
* Update geomap widget to refresh properly
* Add Leaflet MasterCluster plugin
* Setup the marker cluster plugin
* Rearrange real estate demo
* Reduce default cluster radius
* Beginnings of real estate demo
* Fix interpretation of HTTP status codes
* Real estate demo: Make columns hideable
* Real estate demo: sortability
* Real estate demo: search and limit
* Fix typo
* Fix lat long transposition
* Fix startup ordering
* Add geolookup operator
* Real Estate Demo: Add support for computed columns
* Real estate demo: Increase result limit
* Remove demo data
* Track map pan and zoom state in a state tiddler
* WIP
* Use geojson extension for geojson file
* Use geojson extensions for another geojson file
* Split demo from the geospatial plugin into its own edition
* Add build targets required by ./bin/site-build.sh...
... when building the geospatial edition as the main edition, making it easier to find on Vercel
* CI Fixes
* Fix default tab
* Rearranging geospatial plugin vs. edition
* More refactoring between demo and plugin
* Start of plugin docs
* Display GeoJSON properties on click
* Fix layer lookup demo
* Restore XLSX Utils plugin and dependencies
* Cleanup docs
* Remove 5.2.8 release note
* Remove 5.2.8 release note
* Docs update
* Fix minor refreshing bug for geomap widget
* Docs updates
* Add jsonset operator
* Add geonearestpoint operator
* jsonset: support for other data types and documentation
* Add logo
* Add link to preview build
* jsonset: add support for assigning JSON strings
* Fix nonstandard initialisation code for fill/parameter/slot widgets
* Introduce testcase widget so that we can reuse testcases as documentation examples
There's still a bit to do: adding tabs to the source panel of the testcase display, and tweaking the CSS.
* Update logo
* Testcasewidget: Add tabs for switching between source tiddlers
* Testcase appearance tweaks
* Switch to fluid-fixed layout
* Docs for the testcase-transclude and testcase-view widgets
* Split docs into separate tabs
* Extend testcase-view to be able to view other fields
* Extend default testcase template to show all fields of payload tiddlers
* Add some geomap examples
* Fix testcase rounded corners
* Add a geomap layer demo
* Add favicon
* Switch from building the geospatial plugin as the main build back to tw5.com
To make it easier to get to the documentation for the new features
* Remove obsolete comment
* Remove geospatial plugin from tw5.com build
* Fix build link
* Add note about core enhancements included in this branch
* Refactor data widget implementation
To avoid code duplication
* Integrate test cases with the docs
* Remove erroneously pasted docs material
* Remove erroneously copied olc-encode tests within old-decode test case
* Refactor compound tiddler handling into data widget
And add some tests for the data widget
* Default test case template tweaks
* Move Flickr macros into geospatial plugin from the demo edition
* FlickrDemo: Simplify UI
* FlickrMacros: Use a template to define photo tiddler fields
* Remove geospatial plugin from prerelease default tiddlers
* Extend Flickr helpers to support photoTiddlerTemplate parameter
* Update modification times of doc tiddlers
So that they are at the top of the recent tab
* Update 5.3.0 release note
* Remove custom CI step for this branch
* Restore standard sitetitle
* Flickr macro docs
* Rename $:/tags/GeoLayer to $:/tags/GeoFeature
And make sure that it works with all GeoJSON features, not just polygons
* More test data (from leaflet.js)
* Captions should be transcluded, not viewed raw
* Make HTTP handler use wiki of widget that sent the message
* Switch testcase widget to use an intrinsic template
Makes things much simpler
* Complete Flickr demos
* Extend geonearestpoint operator to work with feature collections
* Extend realestate demo to show data on nearest volcano
* Flickr macros: fix pagination after first page
Make sure that the widget we create to run the actions also has access to the event handlers attached to the rootwidget.
* Real estate demo: Fix nearest volcano
* Testcase docs update
* Testcase template: put title at the top and remove header row
* Docs correction
* New geonearestpoint test case
* Make test cases editable
* Test case default template: Always put "Output" tab first
* Initial Commit
* HttpClient object shouldn't need to know about events
* Add support for cancelling HTTP requests
* Make the number of outstanding HTTP requests available in a state tiddler
* Add a network activity button
Click it to cancel outstanding requests
* WIP
* Fix typo
Thanks @btheado
Co-authored-by: btheado <brian.theado@gmail.com>
* Data widget: parse carriage returns in compound tiddlers
* Fix crash when cancelling more than one HTTP request
Thanks @saqimtiaz
* Further fixes to cancelling outstanding HTTP requests
* Don't have data widget rendering its own JSON
Making the data widget render its raw JSON (introduced in 683ec3300490714da21ef0a1e1e50d348473d868) was a bad idea as it messes up the innerwiki use of the data widget. Instead we use the testcase widget with a special template to render the raw JSON of the payload of a testcase, thus giving us a way to test the data widget
* Fix missed docs update
* Introduce geolayer widget for specifying layers for geomap
* Fix breaking tests
* Remove docs references to obsolete widgets
* Tests for geounion, geointersect and geodifference
* Support for multiple base layers
* Make the layers control visible which allows the base layer to be chosen, and individual overlay layers to be hidden
* Add tiddlers tagged $:/tags/GeoBaseLayer to define some useful map base layers
* Add geobaselayer widget to define base layers
* Add a satellite base layer and another terrain base layer
* Add a note where to get more base layers
* Docs update
* Geomap widget: fix default base layer rendering
* Add startPosition and layersPanel attributes to geomap widget
* Update geolayer widget docs with missing attributes
* Add interactive demos for geounion, geodifference, geointersection
* Open geofeature and geomarker maps on the bounds of their content
* Move settings from demo into plugin
Because now the Flickr macros are part of the plugin
* Icon for geospatial plugin
* Fix missing body
* Flickr Demo typo
* Docs update
* Add support for draggable markers
* Removed accidentally committed file
* Remove unwanted log
* Add support for tm-request-geolocation message
* Fix typo
* Fix bug when fitting to non-extistent bounds
* Update main wiki greeting
* Use "Flickr helpers" instead of "Flickr macros"
* File renames for 05d32716037dd14b8a3741b28a82235defea4701
* Fix testcase widget example
Thanks @btheado
* Fix testcase widget refreshing
* Fix failing tests from 03b6413c7a519429ea75353faf32c0a0baf2b88e
* Docs: Clarify that template must be in the payload
* Testcase widget: Exclude tab state tiddlers
See https://github.com/Jermolene/TiddlyWiki5/pull/7406#discussion_r1327971965
Thanks @btheado
* Remove obsolete setquerystring operator
Instead we have the query- parameters to the http request message
* Remove obsolete change to --setfield command
* Fix tiddler name typo
* Initial Commit
* Add note to preview build
* Fix whitespace and indenting
Thanks @pmario
* Fix crash with unset $tiddler attribute on <$data> widget
Thanks @CodaCodr
* Remove Stamen baselayers
They have stopped making them available for free - see https://maps.stamen.com/stadia-partnership/
* Disable test that won't run in browser CI
* Disable broken tests
* Update olc-encode.tid (#7885)
Correct spelling
* Don't duplicate "description" field in test cases
* Use different background colours for nested testcase widgets
* Extend the testcase widget to run tests
* Add testcases to control panel
* Add a view template body template to render testcase tiddlers
* Test edition should display testcases
* Whitespace fixes
* Make testcase tiddler tempalte link to itself
* Styling tweaks
* Docs improvements
* Styling tweaks
* Run the new tw5.com testcases in the test edition
* Update data widget to display its content in JSON
* Add testcase convenience procedure
* Clearer testcases for data widget, and docs tweaks
* Don't expect our intentionally failing test to pass
* Extend testcase default template so that the display format can be chosen
It is selected by setting the variable "displayFormat"
* DataWidget docs typo
* Mark Geospatial plugin as experimental
* Update to Leaflet v1.9.4
* Remove unneeded template
Left over from when the testcase widget was first implemented
* Don't hide the volcanoes of the world data set
* Update Flickr demo docs
* Fix subtle typo that was preventing popups from working correctly
* Go back to hiding the volcanoes of the world by default
Too much data for a small device now that the markers are displayed correctly
* Clarify docs for tm-request-location
* Update modified testcase from master
* Prepare for merging
---------
Co-authored-by: btheado <brian.theado@gmail.com>
Co-authored-by: Drevarr <drevarr@gmail.com>
2024-05-31 12:31:30 +00:00
|
|
|
this.renderMap();
|
|
|
|
this.refreshMap();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
GeomapWidget.prototype.renderMap = function() {
|
|
|
|
var self = this;
|
|
|
|
// Create the map
|
|
|
|
this.map = $tw.Leaflet.map(this.domNode);
|
|
|
|
// No layers rendered
|
|
|
|
this.renderedLayers = [];
|
|
|
|
this.baseLayers = [];
|
|
|
|
// Disable Leaflet attribution
|
|
|
|
this.map.attributionControl.setPrefix("");
|
|
|
|
// Add scale
|
|
|
|
$tw.Leaflet.control.scale().addTo(this.map);
|
|
|
|
// Listen for pan and zoom events and update the state tiddler
|
|
|
|
this.map.on("moveend zoomend",function(event) {
|
|
|
|
if(self.geomapStateTitle) {
|
|
|
|
var c = self.map.getCenter(),
|
|
|
|
lat = "" + c.lat,
|
|
|
|
long = "" + c.lng,
|
|
|
|
zoom = "" + self.map.getZoom(),
|
|
|
|
tiddler = self.wiki.getTiddler(self.geomapStateTitle);
|
|
|
|
// Only write the tiddler if the values have changed
|
|
|
|
if(!tiddler || tiddler.fields.lat !== lat || tiddler.fields.long !== long || tiddler.fields.zoom !== zoom) {
|
|
|
|
self.wiki.addTiddler(new $tw.Tiddler({
|
|
|
|
title: self.geomapStateTitle,
|
|
|
|
lat: lat,
|
|
|
|
long: long,
|
|
|
|
zoom: zoom
|
|
|
|
}));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
GeomapWidget.prototype.refreshMap = function() {
|
|
|
|
var self = this;
|
|
|
|
// Remove any previously rendered layers
|
|
|
|
$tw.utils.each(this.renderedLayers,function(layer) {
|
|
|
|
self.map.removeLayer(layer.layer);
|
|
|
|
});
|
|
|
|
this.renderedLayers = []; // Array of {name:,layer:}
|
|
|
|
$tw.utils.each(this.renderedBaseLayers,function(baseLayer) {
|
|
|
|
self.map.removeLayer(baseLayer.layer);
|
|
|
|
});
|
|
|
|
this.renderedBaseLayers = []; // Array of {name:,layer:}
|
|
|
|
// Create default icon
|
|
|
|
var iconProportions = 365/560,
|
|
|
|
iconHeight = 50;
|
|
|
|
var myIcon = new $tw.Leaflet.Icon({
|
|
|
|
iconUrl: $tw.utils.makeDataUri(this.wiki.getTiddlerText("$:/plugins/tiddlywiki/geospatial/images/markers/pin"),"image/svg+xml"),
|
|
|
|
iconSize: [iconHeight * iconProportions, iconHeight], // Size of the icon
|
|
|
|
iconAnchor: [(iconHeight * iconProportions) / 2, iconHeight], // Position of the anchor within the icon
|
|
|
|
popupAnchor: [0, -iconHeight] // Position of the popup anchor relative to the icon anchor
|
|
|
|
});
|
|
|
|
// Counter for autogenerated names
|
|
|
|
var untitledCount = 1;
|
|
|
|
// Process embedded geobaselayer widgets
|
|
|
|
function loadBaseLayer(layerInfo) {
|
|
|
|
if(layerInfo.title) {
|
|
|
|
var tiddler = self.wiki.getTiddler(layerInfo.title);
|
|
|
|
if(tiddler) {
|
|
|
|
layerInfo.name = layerInfo.name || tiddler.fields["caption"];
|
|
|
|
layerInfo.tilesUrl = layerInfo.tilesUrl || tiddler.fields["tiles-url"];
|
|
|
|
layerInfo.maxZoom = layerInfo.maxZoom || tiddler.fields["max-zoom"];
|
|
|
|
layerInfo.attribution = layerInfo.attribution || tiddler.fields.text;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var baseLayer = $tw.Leaflet.tileLayer(layerInfo.tilesUrl, {
|
|
|
|
maxZoom: layerInfo.maxZoom,
|
|
|
|
attribution: layerInfo.attribution
|
|
|
|
});
|
|
|
|
if(self.renderedBaseLayers.length === 0) {
|
|
|
|
baseLayer.addTo(self.map)
|
|
|
|
}
|
|
|
|
var name = layerInfo.name || ("Untitled " + untitledCount++);
|
|
|
|
self.renderedBaseLayers.push({name: name, layer: baseLayer});
|
|
|
|
}
|
|
|
|
this.findChildrenDataWidgets(this.contentRoot.children,"geobaselayer",function(widget) {
|
|
|
|
loadBaseLayer({
|
|
|
|
name: widget.getAttribute("name"),
|
|
|
|
title: widget.getAttribute("title"),
|
|
|
|
tilesUrl: widget.getAttribute("tiles-url"),
|
|
|
|
maxZoom: widget.getAttribute("max-zoom"),
|
|
|
|
attribution: widget.getAttribute("attribution"),
|
|
|
|
});
|
|
|
|
});
|
|
|
|
// Create the default base map if none was specified
|
|
|
|
if(this.renderedBaseLayers.length === 0) {
|
|
|
|
// Render in reverse order so that the first tagged base layer will be rendered last, and hence take priority
|
|
|
|
var baseLayerTitles = this.wiki.filterTiddlers("[all[tiddlers+shadows]tag[$:/tags/GeoBaseLayer]]");
|
|
|
|
$tw.utils.each(baseLayerTitles,function(title) {
|
|
|
|
loadBaseLayer({title: title});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if(this.renderedBaseLayers.length === 0) {
|
|
|
|
loadBaseLayer({title: "$:/plugins/tiddlywiki/geospatial/baselayers/openstreetmap"});
|
|
|
|
}
|
|
|
|
// Make a marker cluster
|
|
|
|
var markers = $tw.Leaflet.markerClusterGroup({
|
|
|
|
maxClusterRadius: 40
|
|
|
|
});
|
|
|
|
this.map.addLayer(markers);
|
|
|
|
// Process embedded geolayer widgets
|
|
|
|
this.findChildrenDataWidgets(this.contentRoot.children,"geolayer",function(widget) {
|
|
|
|
var jsonText = widget.getAttribute("json"),
|
|
|
|
geoJson = [];
|
|
|
|
if(jsonText) {
|
|
|
|
// Layer is defined by JSON blob
|
|
|
|
geoJson = $tw.utils.parseJSONSafe(jsonText,[]);
|
|
|
|
} else if(widget.hasAttribute("lat") && widget.hasAttribute("long")) {
|
|
|
|
// Layer is defined by lat long fields
|
|
|
|
var lat = $tw.utils.parseNumber(widget.getAttribute("lat","0")),
|
|
|
|
long = $tw.utils.parseNumber(widget.getAttribute("long","0")),
|
|
|
|
alt = $tw.utils.parseNumber(widget.getAttribute("alt","0"));
|
|
|
|
geoJson = {
|
|
|
|
"type": "FeatureCollection",
|
|
|
|
"features": [
|
|
|
|
{
|
|
|
|
"type": "Feature",
|
|
|
|
"geometry": {
|
|
|
|
"type": "Point",
|
|
|
|
"coordinates": [long,lat,alt]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
]
|
|
|
|
};
|
|
|
|
}
|
|
|
|
var draggable = widget.getAttribute("draggable","no") === "yes",
|
|
|
|
layer = $tw.Leaflet.geoJSON(geoJson,{
|
|
|
|
style: function(geoJsonFeature) {
|
|
|
|
return {
|
|
|
|
color: widget.getAttribute("color","yellow")
|
|
|
|
}
|
|
|
|
},
|
|
|
|
pointToLayer: function(geoJsonPoint,latlng) {
|
|
|
|
var marker = $tw.Leaflet.marker(latlng,{icon: myIcon,draggable: draggable});
|
|
|
|
marker.addTo(markers);
|
|
|
|
marker.on("moveend",function(event) {
|
|
|
|
var latlng = event.sourceTarget.getLatLng();
|
|
|
|
self.invokeActionString(widget.getAttribute("updateActions"),null,event,{
|
|
|
|
lat: latlng.lat,
|
|
|
|
long: latlng.lng
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return marker;
|
|
|
|
},
|
|
|
|
onEachFeature: function(feature,layer) {
|
|
|
|
if(feature.properties) {
|
|
|
|
layer.bindPopup(JSON.stringify(feature.properties,null,4));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}).addTo(self.map);
|
|
|
|
var name = widget.getAttribute("name") || ("Untitled " + untitledCount++);
|
|
|
|
self.renderedLayers.push({name: name, layer: layer});
|
|
|
|
});
|
|
|
|
// Setup the layer control
|
|
|
|
if(this.layerControl) {
|
|
|
|
this.map.removeControl(this.layerControl);
|
|
|
|
}
|
|
|
|
var baseLayers = {};
|
|
|
|
$tw.utils.each(this.renderedBaseLayers,function(layer) {
|
|
|
|
baseLayers[layer.name] = layer.layer;
|
|
|
|
});
|
|
|
|
var overlayLayers = {};
|
|
|
|
$tw.utils.each(this.renderedLayers,function(layer) {
|
|
|
|
overlayLayers[layer.name] = layer.layer;
|
|
|
|
});
|
|
|
|
this.layerControl = $tw.Leaflet.control.layers(baseLayers,overlayLayers,{
|
|
|
|
collapsed: this.geomapLayersPanel !== "open"
|
|
|
|
}).addTo(this.map);
|
|
|
|
// Restore the saved map position and zoom level
|
|
|
|
if(!this.setMapView()) {
|
|
|
|
// If there was no saved position then look at the startPosition attribute
|
|
|
|
switch(this.geomapStartPosition) {
|
|
|
|
case "bounds":
|
|
|
|
var bounds = null;
|
|
|
|
$tw.utils.each(this.renderedLayers,function(layer) {
|
|
|
|
var featureBounds = layer.layer.getBounds();
|
|
|
|
if(bounds) {
|
|
|
|
bounds.extend(featureBounds);
|
|
|
|
} else {
|
|
|
|
bounds = featureBounds;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
if(bounds) {
|
|
|
|
this.map.fitBounds(bounds);
|
|
|
|
} else {
|
|
|
|
this.map.fitWorld();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
this.map.fitWorld();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
Set the map center and zoom level from the values in the state tiddler. Returns true if the map view was successfully set
|
|
|
|
*/
|
|
|
|
GeomapWidget.prototype.setMapView = function() {
|
|
|
|
var stateTiddler = this.geomapStateTitle && this.wiki.getTiddler(this.geomapStateTitle);
|
|
|
|
if(stateTiddler) {
|
|
|
|
this.map.setView([$tw.utils.parseNumber(stateTiddler.fields.lat,0),$tw.utils.parseNumber(stateTiddler.fields.long,0)], $tw.utils.parseNumber(stateTiddler.fields.zoom,0));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
Compute the internal state of the widget
|
|
|
|
*/
|
|
|
|
GeomapWidget.prototype.execute = function() {
|
|
|
|
this.geomapStateTitle = this.getAttribute("state");
|
|
|
|
this.geomapStartPosition = this.getAttribute("startPosition");
|
|
|
|
this.geomapLayersPanel = this.getAttribute("layersPanel");
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
|
|
|
|
*/
|
|
|
|
GeomapWidget.prototype.refresh = function(changedTiddlers) {
|
|
|
|
var changedAttributes = this.computeAttributes();
|
|
|
|
// Refresh child nodes, and rerender map if there have been any changes
|
|
|
|
var result = this.contentRoot.refresh(changedTiddlers);
|
|
|
|
if(result) {
|
|
|
|
this.refreshMap();
|
|
|
|
} else {
|
|
|
|
// If we're not doing a full refresh, reset the position if the state tiddler has changed
|
|
|
|
if(changedAttributes.state || changedTiddlers[this.geomapStateTitle]) {
|
|
|
|
this.geomapStateTitle = this.getAttribute("state");
|
|
|
|
this.setMapView();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
};
|
|
|
|
|
|
|
|
exports.geomap = GeomapWidget;
|
|
|
|
|
|
|
|
})();
|
|
|
|
|