tiddlywiki 5.3.5 → 5.3.7

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/geotools.js

@@ -6,10 +6,7 @@ module-type: library
 Geospatial utilities
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var turf = require("$:/plugins/tiddlywiki/geospatial/turf.js");
@@ -37,5 +34,3 @@ exports.parsePoint = function(str) {
 	// Return the string now we know it is a valid GeoJSON Point
 	return json;
 }
-
-})();

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

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operators for geospatial helpers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var turf = require("$:/plugins/tiddlywiki/geospatial/turf.js");
@@ -18,7 +15,5 @@ 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/lookup.js

@@ -6,10 +6,6 @@ module-type: filteroperator
 Filter operators for geospatial lookup
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var turf = require("$:/plugins/tiddlywiki/geospatial/turf.js"),
@@ -41,5 +37,3 @@ function getPolygonsContainingPoint(featureCollection,point) {
 	});
 	return properties;
 }
-
-})();

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

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operators for geospatial measurement
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var turf = require("$:/plugins/tiddlywiki/geospatial/turf.js"),
@@ -50,5 +47,3 @@ exports.geonearestpoint = function(source,operator,options) {
 		return [];
 	}
 };
-
-})();

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

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operators for open location code conversions
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var openlocationcode = require("$:/plugins/tiddlywiki/geospatial/openlocationcode.js"),
@@ -27,14 +24,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)];
 };
@@ -51,5 +48,3 @@ exports["olc-encode"] = function(source,operator,options) {
 	}
 	return [olc];
 };
-
-})();

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

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operators for geospatial transformation
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var turf = require("$:/plugins/tiddlywiki/geospatial/turf.js"),
@@ -83,6 +80,3 @@ function geojsonOp(geojsonObjects, op) {
 	});
 	return turf.featureCollection(resultFeatures);
 }
-
-
-})();

package/plugins/tiddlywiki/geospatial/plugin.info

@@ -3,5 +3,5 @@
 	"name": "Geospatial Utilities",
 	"description": "Geospatial utilities",
 	"list": "readme docs settings license",
-	"stability": "STABILITY_1_EXPERIMENTAL"
+	"stability": "STABILITY_2_STABLE"
 }

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/startup.js

@@ -6,10 +6,7 @@ module-type: startup
 Geospatial initialisation
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -74,5 +71,3 @@ exports.startup = function() {
 		}
 	});
 };
-
-})();

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>

package/plugins/tiddlywiki/geospatial/widgets/geobaselayer.js

@@ -6,12 +6,7 @@ module-type: widget
 geobaselayer widget to represent a base layer for a geomap widget. Clone of the data widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.geobaselayer = require("$:/core/modules/widgets/data.js").data;
-
-})();

package/plugins/tiddlywiki/geospatial/widgets/geolayer.js

@@ -6,12 +6,7 @@ module-type: widget
 geolayer widget to represent a layer for a geomap widget. Clone of the data widget
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.geolayer = require("$:/core/modules/widgets/data.js").data;
-
-})();

package/plugins/tiddlywiki/geospatial/widgets/geomap.js

@@ -6,10 +6,7 @@ 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;
@@ -48,8 +45,7 @@ GeomapWidget.prototype.render = function(parent,nextSibling) {
 	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";
+	this.setMapSize();
 	// Insert it into the DOM
 	parent.insertBefore(this.domNode,nextSibling);
 	this.domNodes.push(this.domNode);
@@ -63,7 +59,13 @@ GeomapWidget.prototype.render = function(parent,nextSibling) {
 GeomapWidget.prototype.renderMap = function() {
 	var self = this;
 	// Create the map
-	this.map = $tw.Leaflet.map(this.domNode);
+	var options = {
+		
+	};
+	if(this.geomapMaxZoom) {
+		options.maxZoom = $tw.utils.parseInt(this.geomapMaxZoom);
+	}
+	this.map = $tw.Leaflet.map(this.domNode,options);
 	// No layers rendered
 	this.renderedLayers = [];
 	this.baseLayers = [];
@@ -73,16 +75,17 @@ GeomapWidget.prototype.renderMap = function() {
 	$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(),
+		if(self.hasAttribute("state")) {
+			var stateTitle = self.getAttribute("state"),
+				c = self.map.getCenter(),
 				lat = "" + c.lat,
 				long = "" + c.lng,
 				zoom = "" + self.map.getZoom(),
-				tiddler = self.wiki.getTiddler(self.geomapStateTitle);
+				tiddler = self.wiki.getTiddler(stateTitle);
 			// 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,
+					title: stateTitle,
 					lat: lat,
 					long: long,
 					zoom: zoom
@@ -161,9 +164,12 @@ GeomapWidget.prototype.refreshMap = function() {
 	});
 	this.map.addLayer(markers);
 	// Process embedded geolayer widgets
+	var defaultPopupTemplateTitle = self.getAttribute("popupTemplate");
 	this.findChildrenDataWidgets(this.contentRoot.children,"geolayer",function(widget) {
 		var jsonText = widget.getAttribute("json"),
+			popupTemplateTitle = widget.getAttribute("popupTemplate",defaultPopupTemplateTitle),
 			geoJson = [];
+		// Build up the geojson of the layer
 		if(jsonText) {
 			// Layer is defined by JSON blob
 			geoJson = $tw.utils.parseJSONSafe(jsonText,[]);
@@ -171,7 +177,8 @@ GeomapWidget.prototype.refreshMap = function() {
 			// 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"));
+				alt = $tw.utils.parseNumber(widget.getAttribute("alt","0")),
+				properties = widget.getAttribute("properties");
 			geoJson = {
 				"type": "FeatureCollection",
 				"features": [
@@ -184,7 +191,11 @@ GeomapWidget.prototype.refreshMap = function() {
 					}
 				]
 			};
+			if(properties) {
+				geoJson.features[0].properties = $tw.utils.parseJSONSafe(properties);
+			}
 		}
+		// Create and add layer for the geojson
 		var draggable = widget.getAttribute("draggable","no") === "yes",
 			layer = $tw.Leaflet.geoJSON(geoJson,{
 				style: function(geoJsonFeature) {
@@ -199,17 +210,46 @@ GeomapWidget.prototype.refreshMap = function() {
 						var latlng = event.sourceTarget.getLatLng();
 						self.invokeActionString(widget.getAttribute("updateActions"),null,event,{
 							lat: latlng.lat,
-							long: latlng.lng
+							long: latlng.lng,
+							alt: latlng.alt
 						});
 					});
 					return marker;
 				},
 				onEachFeature: function(feature,layer) {
-					if(feature.properties) {
-						layer.bindPopup(JSON.stringify(feature.properties,null,4));
+					if(popupTemplateTitle) {
+						layer.bindPopup(function() {
+							var widget = self.wiki.makeTranscludeWidget(popupTemplateTitle, {
+									document: self.document,
+									parentWidget: self,
+									parseAsInline: false,
+									importPageMacros: true,
+									variables: {
+										feature: JSON.stringify(feature)
+									}
+							});
+							var container = self.document.createElement("div");
+							widget.render(container,null);
+							self.wiki.addEventListener("change",function(changes) {
+								widget.refresh(changes,container,null);
+							});
+							return container;
+						});
+					}
+					// Add event handlers
+					if(widget.hasAttribute("clickActions")) {
+						layer.on("click",function(event) {
+							self.invokeActionString(widget.getAttribute("clickActions"),null,event.originalEvent,{
+								lat: event.latlng.lat,
+								long: event.latlng.lng,
+								alt: event.latlng.alt,
+								properties: JSON.stringify(feature.properties)
+							});
+						});
 					}
 				}
 			}).addTo(self.map);
+		// Create a name for this layer
 		var name = widget.getAttribute("name") || ("Untitled " + untitledCount++);
 		self.renderedLayers.push({name: name, layer: layer});
 	});
@@ -226,20 +266,22 @@ GeomapWidget.prototype.refreshMap = function() {
 		overlayLayers[layer.name] = layer.layer;
 	});
 	this.layerControl = $tw.Leaflet.control.layers(baseLayers,overlayLayers,{
-		collapsed: this.geomapLayersPanel !== "open"
+		collapsed: this.getAttribute("layersPanel") !== "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) {
+		switch(this.getAttribute("startPosition")) {
 			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(featureBounds.isValid()) {
+						if(bounds) {
+							bounds.extend(featureBounds);
+						} else {
+							bounds = featureBounds;
+						}
 					}
 				});
 				if(bounds) {
@@ -259,7 +301,12 @@ GeomapWidget.prototype.refreshMap = function() {
 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);
+	// Set the maximum zoom level
+	if(this.hasAttribute("maxZoom")) {
+		this.map.setMaxZoom($tw.utils.parseInt(this.getAttribute("maxZoom")));
+	}
+	// Set the view to the content of the state tiddler
+	var stateTiddler = this.getAttribute("state") && this.wiki.getTiddler(this.getAttribute("state"));
 	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;
@@ -267,13 +314,15 @@ GeomapWidget.prototype.setMapView = function() {
 	return false;
 };
 
+GeomapWidget.prototype.setMapSize = function() {
+	this.domNode.style.width = this.getAttribute("width","100%");
+	this.domNode.style.height = this.getAttribute("height","600px");
+};
+
 /*
 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");
 };
 
 /*
@@ -286,9 +335,12 @@ GeomapWidget.prototype.refresh = function(changedTiddlers) {
 	if(result) {
 		this.refreshMap();
 	} else {
+		// Reset the width and height and max zoom if they have changed
+		if(changedAttributes.width || changedAttributes.height) {
+			this.setMapSize();
+		}
 		// 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");
+		if(changedAttributes.state || (this.hasAttribute("state") && changedTiddlers[this.getAttribute("state")]) || changedAttributes.maxZoom) {
 			this.setMapView();
 		}
 	}
@@ -296,6 +348,3 @@ GeomapWidget.prototype.refresh = function(changedTiddlers) {
 };
 
 exports.geomap = GeomapWidget;
-
-})();
-

package/plugins/tiddlywiki/github-fork-ribbon/plugin.info

@@ -4,5 +4,5 @@
 	"description": "GitHub-inspired corner ribbon",
 	"author": "Simon Whitaker",
 	"list": "readme usage",
-	"stability": "STABILITY_0_DEPRECATED"
+	"stability": "STABILITY_2_STABLE"
 }

package/plugins/tiddlywiki/github-fork-ribbon/readme.tid

@@ -6,4 +6,4 @@ The ribbon can be positioned over any corner, and can incorporate user defined t
 
 The CSS stylesheet is adapted from work by [[Simon Whitaker|https://github.com/simonwhitaker/github-fork-ribbon-css/]]
 
-[[Plugin source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]
+[[Plugin source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]

package/plugins/tiddlywiki/github-fork-ribbon/template.tid

@@ -11,7 +11,7 @@ left: offset from left in px - No ;
 right: offset from right in px - No ;
 fixed: "fixed" .. If ribbon is at the top, it can be "fixed". Bottom is always fixed
 -->
-\parameters (position:"right", url:"https://github.com/Jermolene/TiddlyWiki5", text:"Fork me on ~GitHub" color:"#aa0000" top:"0" bottom:"0" left:"0" right:"0" fixed:"")
+\parameters (position:"right", url:"https://github.com/TiddlyWiki/TiddlyWiki5", text:"Fork me on ~GitHub" color:"#aa0000" top:"0" bottom:"0" left:"0" right:"0" fixed:"")
 
 <style>
 {{$:/plugins/tiddlywiki/github-fork-ribbon/styles}}