tiddlywiki 5.3.4 → 5.3.6

package/plugins/tiddlywiki/browser-storage/readme.tid

@@ -6,7 +6,7 @@ At startup, the plugin reads tiddlers from local storage. Any tiddlers that are
 
 !! Optional use with ~TiddlyWeb plugin
 
-For wikis served from a ~TiddlyWeb compatible server, including the ~TiddlyWiki Node JS server, this plugin may be added to provide temporary local storage of tiddler changes when the [[tiddlyweb sync adapter|https://github.com/Jermolene/TiddlyWiki5/tree/master/plugins/tiddlywiki/tiddlyweb]] is unable to successfully synchronise with the server, and to automatically synchronise tiddlers saved offline in browser storage once connection is re-established. The use of browser storage allows for tiddlers saved offline to be synchronised with the server even in the case where the browser is closed or the user (purposely, accidentally, or automatically in the case of a mobile browser periodically refreshing) navigates away from the wiki.
+For wikis served from a ~TiddlyWeb compatible server, including the ~TiddlyWiki Node JS server, this plugin may be added to provide temporary local storage of tiddler changes when the [[tiddlyweb sync adapter|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/plugins/tiddlywiki/tiddlyweb]] is unable to successfully synchronise with the server, and to automatically synchronise tiddlers saved offline in browser storage once connection is re-established. The use of browser storage allows for tiddlers saved offline to be synchronised with the server even in the case where the browser is closed or the user (purposely, accidentally, or automatically in the case of a mobile browser periodically refreshing) navigates away from the wiki.
 
 Changes will be synchronised with the server the next time the wiki is loaded in the browser. Tiddlers are removed from browser-storage once synchronised to the server.
 

package/plugins/tiddlywiki/browser-storage/settings.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/browser-storage/settings
+caption: Browser Storage
+tags: $:/tags/ControlPanel/SettingsTab
 
 ! Disable
 

package/plugins/tiddlywiki/browser-storage/startup.js

@@ -26,11 +26,11 @@ var BrowserStorageUtil = require("$:/plugins/tiddlywiki/browser-storage/util.js"
 
 exports.startup = function() {
 	var self = this;
-	
-        // If not exists, add ENABLED tiddler with default value "yes"
-        if(!$tw.wiki.getTiddler(ENABLED_TITLE)) {
-                $tw.wiki.addTiddler({title: ENABLED_TITLE, text: "yes"});
-        }
+
+	// If not exists, add ENABLED tiddler with default value "yes"
+	if(!$tw.wiki.getTiddler(ENABLED_TITLE)) {
+		$tw.wiki.addTiddler({title: ENABLED_TITLE, text: "yes"});
+	}
 	// Compute our prefix for local storage keys
 	var prefix = "tw5#" + window.location.pathname + "#";
 	// Make a logger
@@ -54,6 +54,13 @@ exports.startup = function() {
 		$tw.wiki.addTiddler({title: ENABLED_TITLE, text: "no"});
 		$tw.browserStorage.clearLocalStorage();
 	});
+	// Seperate clear cookie and disable action
+	$tw.rootWidget.addEventListener("tm-delete-browser-storage",function(event) {
+		$tw.browserStorage.clearLocalStorage();
+	});
+	$tw.rootWidget.addEventListener("tm-disable-browser-storage",function(event) {
+		$tw.wiki.addTiddler({title: ENABLED_TITLE, text: "no"});
+	});
 	// Helpers for protecting storage from eviction
 	var setPersistedState = function(state) {
 			$tw.wiki.addTiddler({title: PERSISTED_STATE_TITLE, text: state});
@@ -68,11 +75,11 @@ exports.startup = function() {
 		persistPermissionRequested = false,
 		requestPersistenceOnFirstSave = function() {
 			$tw.hooks.addHook("th-saving-tiddler", function(tiddler) {
-				if (!persistPermissionRequested) {
+				if(!persistPermissionRequested) {
 					var filteredChanges = filterFn.call($tw.wiki, function(iterator) {
 						iterator(tiddler,tiddler.getFieldString("title"));
 					});
-					if (filteredChanges.length > 0) {
+					if(filteredChanges.length > 0) {
 						// The tiddler will be saved to local storage, so request persistence
 						requestPersistence();
 						persistPermissionRequested = true;
@@ -84,9 +91,9 @@ exports.startup = function() {
 	// Request the browser to never evict the localstorage. Some browsers such as firefox
 	// will prompt the user. To make the decision easier for the user only prompt them
 	// when they click the save button on a tiddler which will be stored to localstorage.
-	if (navigator.storage && navigator.storage.persist) {
+	if(navigator.storage && navigator.storage.persist) {
 		navigator.storage.persisted().then(function(isPersisted) {
-			if (!isPersisted) {
+			if(!isPersisted) {
 				setPersistedState("not requested yet");
 				requestPersistenceOnFirstSave();
 			} else {

package/plugins/tiddlywiki/browser-storage/util.js

@@ -53,7 +53,7 @@ BrowserStorageUtil.prototype.saveTiddlerToLocalStorage = function(title) {
     // Get the tiddler
     var tiddler = $tw.wiki.getTiddler(title);
     if(tiddler) {
-        if (this.wiki.tiddlerExists(title)) {
+        if(this.wiki.tiddlerExists(title)) {
             // This is not a shadow tiddler
             console.log("browser-storage: Saving",title);
             // Get the JSON of the tiddler

package/plugins/tiddlywiki/cecily/readme.tid

@@ -6,4 +6,4 @@ Cecily is based on an earlier plugin for TiddlyWiki Classic: http://jermolene.co
 
 Cecily is currently in the early stages of development with little functionality yet implemented.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/cecily]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/cecily]]

package/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid

@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/text/x-tiddlywiki
+description: TiddlyWiki Classic
+name: text/x-tiddlywiki
+group: Texto

package/{languages/sv-SE/Types → plugins/tiddlywiki/classictools/languages/sv-SE/types}/text_x-tiddlywiki.tid

@@ -1,4 +1,4 @@
-title: $:/language/Docs/Types/text/x-tiddlywiki
-description: TiddlyWiki klassisk
-name: text/x-tiddlywiki
-group: Text
+title: $:/language/Docs/Types/text/x-tiddlywiki
+description: TiddlyWiki klassisk
+name: text/x-tiddlywiki
+group: Text

package/plugins/tiddlywiki/classictools/readme.tid

@@ -9,4 +9,4 @@ The additional features are:
 
 See https://github.com/TiddlyWiki/tiddlywiki.com for more details.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/classictools]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/classictools]]

package/plugins/tiddlywiki/codemirror/readme.tid

@@ -2,6 +2,6 @@ title: $:/plugins/tiddlywiki/codemirror/readme
 
 This plugin provides an enhanced text editor component based on [[CodeMirror|http://codemirror.net]]. The basic configuration is designed to be as lightweight as possible and is just around 235kb of size. Additional features can be installed with ~CodeMirror ~AddOns from the plugin library.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/codemirror]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/codemirror]]
 
 Based on ~CodeMirror version 5.58.3

package/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid

@@ -4,4 +4,4 @@ caption: {{$:/language/codemirror/cursorBlinkRate/hint}}
 
 \define lingo-base() $:/language/codemirror/cursorBlinkRate/
 
-|<$link to="$:/config/codemirror/cursorBlinkRate"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/cursorBlinkRate" default="" placeholder="cursorBlinkRate" tag="input"/> |
+|<$link to="$:/config/codemirror/cursorBlinkRate"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/cursorBlinkRate" default="" placeholder="cursorBlinkRate" tag="input" type="number"/> |

package/plugins/tiddlywiki/codemirror/settings/indentUnit.tid

@@ -4,4 +4,4 @@ caption: {{$:/language/codemirror/indentUnit/hint}}
 
 \define lingo-base() $:/language/codemirror/indentUnit/
 
-|<$link to="$:/config/codemirror/indentUnit"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/indentUnit" default="" placeholder="indentUnit" tag="input"/> |
+|<$link to="$:/config/codemirror/indentUnit"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/indentUnit" default="" placeholder="indentUnit" tag="input" type="number"/> |

package/plugins/tiddlywiki/codemirror/settings/tabSize.tid

@@ -4,4 +4,4 @@ caption: {{$:/language/codemirror/tabSize/hint}}
 
 \define lingo-base() $:/language/codemirror/tabSize/
 
-|<$link to="$:/config/codemirror/tabSize"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/tabSize" default="" placeholder="tabSize" tag="input"/> |
+|<$link to="$:/config/codemirror/tabSize"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/tabSize" default="" placeholder="tabSize" tag="input" type="number"/> |

package/plugins/tiddlywiki/codemirror/ui/controlpanel/codemirror.tid

@@ -13,9 +13,9 @@ list-after: $:/core/ui/ControlPanel/Settings/TiddlyWiki
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings/CodeMirror]]">
 
-<div style="border-top:1px solid #eee;">
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> >
 
-!! <$link><$transclude field="caption"/></$link>
+!!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>
 
 <$transclude/>
 

package/plugins/tiddlywiki/comments/config.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/comments/config
+caption: Comments
+tags: $:/tags/ControlPanel/SettingsTab
 
 \define select(description,filter)
 <$button>

package/plugins/tiddlywiki/consent-banner/config.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/consent-banner/config
+caption: Consent Banner
+tags: $:/tags/ControlPanel/SettingsTab
 
 ! [[Greeting Message|$:/config/plugins/tiddlywiki/consent-banner/greeting-message]]
 

package/plugins/tiddlywiki/consent-banner/docs.tid

@@ -61,4 +61,4 @@ Third party plugins that set cookies can configure themselves to defer setting c
 * The consent-banner plugin includes a shadow tiddler [[$:/config/cookie-consent-required]] with the text `yes`. The third-party plugin should inspect this tiddler at startup; if it is not set to "yes" then it can proceed to set tiddlers immediately
 * Otherwise, the third-party plugin should listen for changes to the tiddler [[$:/state/consent-banner/accepted]] and only start setting cookies when and if the value changes to "yes"
 
-The [[Google Analytics plugin|https://github.com/Jermolene/TiddlyWiki5/tree/master/plugins/tiddlywiki/googleanalytics]] shows an example of how this mechanism can be implemented.
+The [[Google Analytics plugin|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/plugins/tiddlywiki/googleanalytics]] shows an example of how this mechanism can be implemented.

package/plugins/tiddlywiki/d3/barwidget.js

@@ -122,7 +122,7 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 	return {
 		domNode: svgElement[0][0],
 		updateChart: function() {
-			if (self.barGrouped !== "no") {
+			if(self.barGrouped !== "no") {
 				transitionGrouped();
 			} else {
 				transitionStacked();
@@ -160,14 +160,14 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 			var x = 1 / (0.1 + Math.random()),
 				y = 2 * Math.random() - 0.5,
 				z = 10 / (0.1 + Math.random());
-			for (var i = 0; i < n; i++) {
+			for(var i = 0; i < n; i++) {
 			var w = (i / n - y) * z;
 			a[i] += x * Math.exp(-w * w);
 			}
 		}
 		var a = [], i;
-		for (i = 0; i < n; ++i) a[i] = o + o * Math.random();
-		for (i = 0; i < 5; ++i) bump(a);
+		for(i = 0; i < n; ++i) a[i] = o + o * Math.random();
+		for(i = 0; i < 5; ++i) bump(a);
 		return a.map(function(d, i) { return {x: i, y: Math.max(0, d)}; });
 	}
 };

package/plugins/tiddlywiki/d3/readme.tid

@@ -4,4 +4,4 @@ The D3 plugin is a proof-of-concept demo of integration with the D3.js data visu
 
 It is not currently in a state where it can be used for anything useful.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/d3]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/d3]]

package/plugins/tiddlywiki/dynaview/config.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/dynaview/config
+caption: Dynaview
+tags: $:/tags/ControlPanel/SettingsTab
 
 <$checkbox tiddler="$:/config/DynaView/ViewportDimensions" field="text" checked="yes" unchecked="no" default="no"> Enable dynamic saving of the viewport [[width|$:/state/DynaView/ViewportDimensions/Width]] and [[height|$:/state/DynaView/ViewportDimensions/Height]]</$checkbox>
 

package/plugins/tiddlywiki/external-attachments/settings.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/external-attachments/settings
+caption: External Attachments
+tags: $:/tags/ControlPanel/SettingsTab
 
 When used on platforms that provide the necessary support (such as ~TiddlyDesktop), you can optionally import binary files as external tiddlers that reference the original file via the ''_canonical_uri'' field.
 

package/plugins/tiddlywiki/filesystem/filesystemadaptor.js

@@ -22,7 +22,9 @@ function FileSystemAdaptor(options) {
 	this.boot = options.boot || $tw.boot;
 	this.logger = new $tw.utils.Logger("filesystem",{colour: "blue"});
 	// Create the <wiki>/tiddlers folder if it doesn't exist
-	$tw.utils.createDirectory(this.boot.wikiTiddlersPath);
+	if(this.boot.wikiTiddlersPath) {
+		$tw.utils.createDirectory(this.boot.wikiTiddlersPath);
+	}
 }
 
 FileSystemAdaptor.prototype.name = "filesystem";
@@ -52,6 +54,10 @@ The type is found by looking up the extension in $tw.config.fileExtensionInfo (e
 It is the responsibility of the filesystem adaptor to update this.boot.files for new files that are created.
 */
 FileSystemAdaptor.prototype.getTiddlerFileInfo = function(tiddler,callback) {
+	// Error if we don't have a this.boot.wikiTiddlersPath
+	if(!this.boot.wikiTiddlersPath) {
+		return callback("filesystemadaptor requires a valid wiki folder");
+	}
 	// Always generate a fileInfo object when this fuction is called
 	var title = tiddler.fields.title, newInfo, pathFilters, extFilters,
 		fileInfo = this.boot.files[title];
@@ -84,7 +90,7 @@ FileSystemAdaptor.prototype.saveTiddler = function(tiddler,callback,options) {
 		}
 		$tw.utils.saveTiddlerToFile(tiddler,fileInfo,function(err,fileInfo) {
 			if(err) {
-				if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "open") {
+				if((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "open") {
 					fileInfo = fileInfo || self.boot.files[tiddler.fields.title];
 					fileInfo.writeError = true;
 					self.boot.files[tiddler.fields.title] = fileInfo;
@@ -131,7 +137,7 @@ FileSystemAdaptor.prototype.deleteTiddler = function(title,callback,options) {
 	if(fileInfo) {
 		$tw.utils.deleteTiddlerFile(fileInfo,function(err,fileInfo) {
 			if(err) {
-				if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
+				if((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
 					// Error deleting the file on disk, should fail gracefully
 					$tw.syncer.displayError("Server desynchronized. Error deleting file for deleted tiddler \"" + title + "\"",err);
 					return callback(null,fileInfo);

package/plugins/tiddlywiki/filesystem/readme.tid

@@ -2,4 +2,4 @@ title: $:/plugins/tiddlywiki/filesystem/readme
 
 The filesystem plugin is used under Node.js to synchronise tiddler changes back to the file system. It is inert when used in the browser.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/filesystem]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/filesystem]]

package/plugins/tiddlywiki/freelinks/settings.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/freelinks/settings
+caption: Freelinks
+tags: $:/tags/ControlPanel/SettingsTab
 
 Filter defining tiddlers to which freelinks are made: <$edit-text tiddler="$:/config/Freelinks/TargetFilter" tag="input" placeholder="Filter expression..." default=""/>
 

package/plugins/tiddlywiki/geospatial/docs/geolayer.tid

@@ -16,9 +16,12 @@ The following attributes are supported:
 |''long'' |Optional longitude of marker if json attribute missing |
 |''alt'' |Optional altitude of marker if json attribute missing |
 |''draggable'' |Set to "yes" to make the marker draggable |
-|''updateActions'' |Optional actions when the marker is dragged other otherwise modified. The variables ''lat'' and ''long'' contain the new coordinates of the marker |
+|''updateActions'' |Optional actions when the marker is dragged other otherwise modified. The variables ''lat'', ''long'' and ''alt'' contain the new coordinates of the marker |
+|''clickActions'' |<<.from-version "5.3.6">> Optional actions when the marker is clicked. The variable ''properties'' contains the JSON properties of the marker.  The variables ''lat'', ''long'' and ''alt'' contain the coordinates of the marker |
+|''properties'' |<<.from-version "5.3.6">> Optional JSON properties to be attached to the marker (only supported for non-JSON layers) |
+|''popupTemplate'' |<<.from-version "5.3.6">> Optional template to be used for popups. The template is rendered with the variable ''feature'' containing the JSON text of the feature |
 
 Note that the `<$geolayer>` widget can be used in one of two modes:
 
 * With the ''json'' attibute specifying the layer to be drawn
-* With the ''lat'', ''long'' and optional ''alt'' attributes specifying a marker to be drawn
+* With the ''lat'', ''long'' and optional ''alt'' and ''properties'' attributes specifying a marker to be drawn

package/plugins/tiddlywiki/geospatial/docs/geomap.tid

@@ -9,9 +9,13 @@ The `<$geomap>` widget displays an interactive map using [[Leaflet.js|https://le
 The following attributes are supported:
 
 |!Attribute |!Description |
+|''width'' |<<.from-version "5.3.6">> The width of the map in CSS units (defaults to `100%`) |
+|''height'' |<<.from-version "5.3.6">> The height of the map in CSS units (defaults to `600px`) |
 |''state'' |The title of a state tiddler used to track the state of the map in the `zoom`, `long` and `lat` fields |
 |''startPosition'' |Optional keyword representing the starting position for the map: "world" (the default) shows the entire map, "bounds" zooms to the bounds of the loaded layers |
 |''layersPanel'' |Optional starting status for the layers panel: "collapsed" (the default) causes the layers panel to initially be shown collapsed, "open" causes the layers panel to initially be shown opened |
+|''maxZoom'' |<<.from-version "5.3.6">> Optional maximum zoom level, from 1 to the maximum zoom level supported by the background layer |
+|''popupTemplate'' |<<.from-version "5.3.6">> Optional template to be used for popups. The template is rendered with the variable ''feature'' containing the JSON text of the feature |
 
 If no base layers are defined by `<$geobaselayer>` widgets within the `<$geomap>` widget then all the available base layers will be loaded by the equivalent of the following code:
 
@@ -49,7 +53,7 @@ If no base layers are defined by `<$geobaselayer>` widgets within the `<$geomap>
 	lat="51.751944"
 	long="-1.257778"
 	alt="0"
-	text="""This is Oxford!"""/>
+	text="""{{$:/core/images/star-filled}} This is Oxford!"""/>
 <$data title="Output" text="""<$geomap
 	state=<<qualify "$:/state/demo-map">>
 >
@@ -61,6 +65,72 @@ If no base layers are defined by `<$geobaselayer>` widgets within the `<$geomap>
 <$data $tiddler="$:/plugins/tiddlywiki/geospatial"/>
 </$testcase>
 
+<$testcase>
+<$data
+	title="Description"
+	text="Map with geomarker with popup"
+/>
+<$data $filter="[tag[$:/tags/Demo/Cities]sort[title]]"/>
+<$data title="Output" text="""<$geomap
+	state=<<qualify "$:/state/demo-map">>
+	popupTemplate="ui/PopupTemplate"
+>
+	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoMarker]]">
+		<$geolayer lat={{!!lat}} long={{!!long}} alt={{!!alt}} color={{!!color}} properties={{{ [[{}]jsonset[title],<currentTiddler>] }}}/>
+	</$list>
+</$geomap>
+"""/>
+<$data
+	title="Oxford"
+	tags="$:/tags/GeoMarker"
+	caption="Oxford"
+	lat="51.751944"
+	long="-1.257778"
+	alt="0"
+	text="""{{$:/core/images/star-filled}} This is Oxford!"""/>
+	properties=""/>
+<$data title="ui/PopupTemplate" text="""
+	<div width="300px">
+		<$let currentTiddler={{{ [<feature>jsonget[properties],[title]] }}}>
+			<$link><$text text=<<currentTiddler>>/></$link>
+			<!-- <$codeblock code={{{ [<feature>] }}}/> -->
+			<$transclude $tiddler=<<currentTiddler>> $mode="block"/>
+		</$let>
+	</div>
+"""/>
+<$data $tiddler="$:/plugins/tiddlywiki/geospatial"/>
+</$testcase>
+
+<$testcase>
+<$data
+	title="Description"
+	text="Map with geomarker with actions"
+/>
+<$data title="MarkerClickActions" text="""
+	<$action-setfield $tiddler="$:/clicked-marker" text={{{ =[<properties>] =[<lat>] =[<long>] =[<alt>] +[join[,]] }}}/>
+"""/>
+<$data title="Output" text="""Marker: <$text text={{$:/clicked-marker}}/>
+
+<$geomap
+	state=<<qualify "$:/state/demo-map">>
+>
+	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoMarker]]">
+		<$geolayer lat={{!!lat}} long={{!!long}} alt={{!!alt}} color={{!!color}} properties={{{ [[{}]jsonset[title],<currentTiddler>] }}} clickActions={{MarkerClickActions}}/>
+	</$list>
+</$geomap>
+"""/>
+<$data
+	title="Oxford"
+	tags="$:/tags/GeoMarker"
+	caption="Oxford"
+	lat="51.751944"
+	long="-1.257778"
+	alt="0"
+	text="""{{$:/core/images/star-filled}} This is Oxford!"""/>
+	properties={{{ [[{}]jsonset[title],[Oxford] }}}/>
+<$data $tiddler="$:/plugins/tiddlywiki/geospatial"/>
+</$testcase>
+
 <$testcase>
 <$data
 	title="Description"

package/plugins/tiddlywiki/geospatial/images/markers/pin.svg

@@ -1,9 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 365 560">
-<g>
-	<path fill="#00AEEF" stroke="#000000" stroke-width="5" d="M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9
-		C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,175.3,357.4S182.9,551.7,182.9,551.7z M122.2,187.2c0-33.6,27.2-60.8,60.8-60.8
-		c33.6,0,60.8,27.2,60.8,60.8S216.5,248,182.9,248C149.4,248,122.2,220.8,122.2,187.2z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 365 560"><path fill="#00AEEF" stroke="#000" stroke-width="5" d="M182.9 551.7c0 .1.2.3.2.3s175.2-269 175.2-357.4c0-130.1-88.8-186.7-175.4-186.9C96.3 7.9 7.5 64.5 7.5 194.6 7.5 283 182.8 552 182.8 552l.1-.3zm-60.7-364.5c0-33.6 27.2-60.8 60.8-60.8 33.6 0 60.8 27.2 60.8 60.8S216.5 248 182.9 248c-33.5 0-60.7-27.2-60.7-60.8z"/></svg>

package/plugins/tiddlywiki/geospatial/operators/helper.js

@@ -18,7 +18,7 @@ exports.geopoint = function(source,operator,options) {
 	var lat = $tw.utils.parseNumber(operator.operands[0] || "0"),
 		long = $tw.utils.parseNumber(operator.operands[1] || "0"),
 		alt =  $tw.utils.parseNumber(operator.operands[2] || "0");
-	return [JSON.stringify(turf.point([lat,long,alt]))];
+	return [JSON.stringify(turf.point([long,lat,alt]))];
 };
 
 })();

package/plugins/tiddlywiki/geospatial/operators/olc.js

@@ -27,14 +27,14 @@ exports["olc-decode"] = function(source,operator,options) {
 		obj;
 	if(suffixes.indexOf("bounds") !== -1) {
 		obj = turf.polygon([[
-			[olc.latitudeLo, olc.longitudeLo],
-			[olc.latitudeHi, olc.longitudeLo],
-			[olc.latitudeHi, olc.longitudeHi],
-			[olc.latitudeLo, olc.longitudeHi],
-			[olc.latitudeLo, olc.longitudeLo]
+			[olc.longitudeLo, olc.latitudeLo],
+			[olc.longitudeLo, olc.latitudeHi],
+			[olc.longitudeHi, olc.latitudeHi],
+			[olc.longitudeHi, olc.latitudeLo],
+			[olc.longitudeLo, olc.latitudeLo]
 		]]);
 	} else {
-		obj = turf.point([olc.latitudeCenter,olc.longitudeCenter]);
+		obj = turf.point([olc.longitudeCenter,olc.latitudeCenter]);
 	}
 	return [JSON.stringify(obj)];
 };

package/plugins/tiddlywiki/geospatial/settings.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/geospatial/settings
+caption: Geospatial
+tags: $:/tags/ControlPanel/SettingsTab
 
 ! Geospatial Plugin Settings
 

package/plugins/tiddlywiki/geospatial/tests/operators/geodistance.tid

@@ -27,4 +27,4 @@ title: Output
 +
 title: ExpectedResult
 
-<p>5042.67688063485,5042.67688063485,8115.401781788412,72.89828683394038,1.2738016908387275,5042.67688063485</p>
+<p>3406.2115173004354,3406.2115173004354,5481.766068098352,49.241105484826875,0.8604235593111019,3406.2115173004354</p>

package/plugins/tiddlywiki/geospatial/tests/operators/geolookup.tid

@@ -22,7 +22,7 @@ type: application/json
 			"type": "Feature",
 			"geometry": {
 				"type": "Point",
-				"coordinates": [102.0,0.5]
+				"coordinates": [0.5,102.0]
 			},
 			"properties": {
 				"animal": "amoeba"
@@ -33,7 +33,7 @@ type: application/json
 			"geometry": {
 				"type": "LineString",
 				"coordinates": [
-					[102.0,0.0],[103.0,1.0],[104.0,0.0],[105.0,1.0]
+					[0.0,102.0],[1.0,103.0],[0.0,104.0],[1.0,105.0]
 				]
 			},
 			"properties": {
@@ -46,7 +46,7 @@ type: application/json
 			"geometry": {
 				"type": "Polygon",
 				"coordinates": [
-					[[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]]
+					[[0.0,100.0],[0.0,101.0],[1.0,101.0],[1.0,100.0],[0.0,100.0]]
 				]
 			},
 			"properties": {

package/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid

@@ -17,7 +17,7 @@ title: Output
 >
 
 <$text text={{{ =[<oxford>] =[<winchester>] +[geonearestpoint<new-york>jsonget[id]] }}}/>,
-<$text text={{{ =[<oxford>] =[[Not a point]] +[geonearestpoint<new-york>jsonget[id]] }}}/>,
+<$text text={{{ =[<winchester>] =[[Not a point]] +[geonearestpoint<new-york>jsonget[id]] }}}/>,
 <$text text={{{ =[[Not a point]] +[geonearestpoint<new-york>jsonget[id]] }}}/>
 
 </$let>
@@ -25,4 +25,4 @@ title: Output
 +
 title: ExpectedResult
 
-<p>Winchester,Oxford,</p>
+<p>Oxford,Winchester,</p>

package/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint2.tid

@@ -22,14 +22,14 @@ title: Output
 			"id": "Oxford",
 			"geometry": {
 				"type": "Point",
-				"coordinates": [51.751944, -1.257778]
+				"coordinates": [-1.257778, 51.751944]
 			}
 		},{
 			"type": "Feature",
 			"id": "Winchester",
 			"geometry": {
 				"type": "Point",
-				"coordinates": [51.0632, -1.308]
+				"coordinates": [-1.308, 51.0632]
 			}
 		}
 	]
@@ -42,4 +42,4 @@ title: Output
 +
 title: ExpectedResult
 
-<p>Winchester</p>
+<p>Oxford</p>

package/plugins/tiddlywiki/geospatial/tests/operators/geopoint.tid

@@ -18,4 +18,4 @@ title: Output
 +
 title: ExpectedResult
 
-{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.751944,-1.257778,0]}}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.751944,-1.257778,0]},"id":"Oxford"}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.751944,-1.257778,2]}}
+{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257778,51.751944,0]}}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257778,51.751944,0]},"id":"Oxford"}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257778,51.751944,2]}}

package/plugins/tiddlywiki/geospatial/tests/operators/olc-decode.tid

@@ -15,6 +15,6 @@ title: Output
 +
 title: ExpectedResult
 
-<p>({"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[51.751875,-1.257875],[51.752,-1.257875],[51.752,-1.25775],[51.751875,-1.25775],[51.751875,-1.257875]]]}})
-({"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.7519375,-1.257765625]}})
+<p>({"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-1.257875,51.751875],[-1.257875,51.752],[-1.25775,51.752],[-1.25775,51.751875],[-1.257875,51.751875]]]}})
+({"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257765625,51.7519375]}})
 </p>

package/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid

@@ -0,0 +1,19 @@
+title: $:/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer
+description: Map using geolayer without json and lat/long attributes
+import: $:/plugins/tiddlywiki/geospatial
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Narrative
+
+Verify exception reported in [[8452|https://github.com/TiddlyWiki/TiddlyWiki5/issues/8452]] is not thrown when the geolayer widget has no attributes
++
+title: Output
+
+<$geomap startPosition="bounds">
+<$geolayer/>
+</$geomap>
++
+title: ExpectedResult
+
+<p><div style="width:100%;height:600px;"></div></p>