Let user specify custom map by default
This commit is contained in:
Dave Conway-Jones
parent
5eb3985ad1
commit
c94545d648
@ -1,5 +1,6 @@
|
||||
### Change Log for Node-RED Worldmap
|
||||
|
||||
- v2.16.0 - Allow specifying custom base map server.
|
||||
- v2.15.8 - Adjust ui check timing for UI worldmap.
|
||||
- v2.15.7 - Tidy up geoJson handling a bit more.
|
||||
- v2.15.5 - Fix SIDC icons to accept unicoded icons as labels.
|
||||
|
||||
@ -11,6 +11,7 @@ map web page for plotting "things" on.
|
||||
|
||||
### Updates
|
||||
|
||||
- v2.16.0 - Allow specifying custom base map server.
|
||||
- v2.15.8 - Adjust ui check timing for UI worldmap.
|
||||
- v2.15.7 - Tidy up geoJson handling a bit more.
|
||||
- v2.15.5 - Fix SIDC icons to accept unicoded icons as labels.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "node-red-contrib-web-worldmap",
|
||||
"version": "2.15.8",
|
||||
"version": "2.16.0",
|
||||
"description": "A Node-RED node to provide a web page of a world map for plotting things on.",
|
||||
"dependencies": {
|
||||
"cgi": "0.3.1",
|
||||
@ -32,7 +32,7 @@
|
||||
},
|
||||
"author": {
|
||||
"name": "Dave Conway-Jones",
|
||||
"email": "ceejay@vnet.ibm.com",
|
||||
"email": "dceejay@gmail.com",
|
||||
"url": "http://nodered.org"
|
||||
},
|
||||
"contributors": [
|
||||
|
||||
@ -1,20 +1,4 @@
|
||||
<!DOCTYPE html>
|
||||
<!--
|
||||
Copyright 2015, 2021 IBM Corp.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<script type="text/html" data-template-name="worldmap">
|
||||
<div class="form-row">
|
||||
<table border="0" width="96%">
|
||||
@ -28,7 +12,7 @@
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-layer"><i class="fa fa-map"></i> Base map</label>
|
||||
<select id="node-input-layer">
|
||||
<select id="node-input-layer" style="width:70%;">
|
||||
<option value="OSM grey">OpenStreetMap Greyscale</option>
|
||||
<option value="OSM">OpenStreetMap</option>
|
||||
<option value="Esri">ESRI Streetmap</option>
|
||||
@ -42,8 +26,20 @@
|
||||
<option value="Hike Bike">Hike Bike OSM</option>
|
||||
<option value="Terrain">Terrain</option>
|
||||
<option value="Watercolor">Stamen Watercolor</option>
|
||||
<option value="Custom">Custom Map Provider</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-row" id="customMap">
|
||||
<label for="node-input-mapname"> Map name</label>
|
||||
<input type="text" id="node-input-mapname" placeholder="name for Layer Menu"><br/>
|
||||
<label for="node-input-mapurl"> Map URL</label>
|
||||
<input type="text" id="node-input-mapurl" placeholder="URL"><br/>
|
||||
<label for="node-input-mapopt"> Map options</label>
|
||||
<input type="text" id="node-input-mapopt" placeholder="options (Leaflet JSON string)"><br/>
|
||||
<label for="node-input-mapwms"> </label>
|
||||
<input type="checkbox" id="node-input-mapwms" style="display:inline-block; width:20px; vertical-align:baseline;">
|
||||
Map server uses WMS
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-cluster"><i class="fa fa-dot-circle-o"></i>Cluster when</label>
|
||||
zoom level is less than <input type="text" id="node-input-cluster" placeholder="0 (0,off - 19)" style="width:100px;">
|
||||
@ -90,13 +86,13 @@
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-coords"><i class="fa fa-compass"></i> Co-ordinates</label>
|
||||
<select id="node-input-coords" style="width:95px;">
|
||||
<select id="node-input-coords" style="width:101px;">
|
||||
<option value="none">Not shown</option>
|
||||
<option value="deg">Degrees</option>
|
||||
<option value="dms">D.M.S</option>
|
||||
</select>
|
||||
<i class="fa fa-th" style="margin-left:22px;"></i> Graticule
|
||||
<select id="node-input-showgrid" style="width:95px;">
|
||||
<select id="node-input-showgrid" style="width:101px;">
|
||||
<option value="false">Not shown</option>
|
||||
<option value="true">Visible</option>
|
||||
</select>
|
||||
@ -114,8 +110,8 @@
|
||||
<label for="node-input-name"><i class="fa fa-file"></i> Name</label>
|
||||
<input type="text" id="node-input-name" placeholder="name">
|
||||
</div>
|
||||
<div class="form-tips">Set <i>Cluster when</i> to 0 to disable clustering of points.<br/>If <i>Path</i> is left empty,
|
||||
then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the map in a new tab.</div>
|
||||
<div class="form-tips">Set <i>Cluster when</i> to 0 to disable clustering of points.<br/>
|
||||
If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the map in a new tab.</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" data-help-name="worldmap">
|
||||
@ -193,8 +189,20 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
<option value="Hike Bike">Hike Bike OSM</option>
|
||||
<option value="Terrain">Terrain</option>
|
||||
<option value="Watercolor">Stamen Watercolor</option>
|
||||
<option value="Custom">Custom Map Provider</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-row" id="customMap">
|
||||
<label for="node-input-mapname"> Map name</label>
|
||||
<input type="text" id="node-input-mapname" placeholder="name for Layer Menu"><br/>
|
||||
<label for="node-input-mapurl"> Map URL</label>
|
||||
<input type="text" id="node-input-mapurl" placeholder="URL"><br/>
|
||||
<label for="node-input-mapopt"> Map options</label>
|
||||
<input type="text" id="node-input-mapopt" placeholder="options (Leaflet JSON string)"><br/>
|
||||
<label for="node-input-mapwms"> </label>
|
||||
<input type="checkbox" id="node-input-mapwms" style="display:inline-block; width:20px; vertical-align:baseline;">
|
||||
Map server uses WMS
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-cluster"><i class="fa fa-dot-circle-o"></i>Cluster when</label>
|
||||
zoom level is less than <input type="text" id="node-input-cluster" placeholder="0 (0,off - 19)" style="width:100px;">
|
||||
@ -241,13 +249,13 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-coords"><i class="fa fa-compass"></i> Co-ordinates</label>
|
||||
<select id="node-input-coords" style="width:95px;">
|
||||
<select id="node-input-coords" style="width:101px;">
|
||||
<option value="none">Not shown</option>
|
||||
<option value="deg">Degrees</option>
|
||||
<option value="dms">D.M.S</option>
|
||||
</select>
|
||||
<i class="fa fa-th" style="margin-left:22px;"></i> Graticule
|
||||
<select id="node-input-showgrid" style="width:95px;">
|
||||
<select id="node-input-showgrid" style="width:101px;">
|
||||
<option value="false">Not shown</option>
|
||||
<option value="true">Visible</option>
|
||||
</select>
|
||||
@ -265,8 +273,8 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
<label for="node-input-name"><i class="fa fa-file"></i> Name</label>
|
||||
<input type="text" id="node-input-name" placeholder="name">
|
||||
</div>
|
||||
<div class="form-tips">Set <i>Cluster when</i> to 0 to disable clustering of points.<br/>If <i>Path</i> is left empty,
|
||||
then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the map in a new tab.</div>
|
||||
<div class="form-tips">Set <i>Cluster when</i> to 0 to disable clustering of points.<br/>
|
||||
If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the map in a new tab.</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" data-help-name="ui_worldmap">
|
||||
@ -336,7 +344,11 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
coords: {value:"false"},
|
||||
showgrid: {value:"false"},
|
||||
allowFileDrop: {value:"false"},
|
||||
path: {value:"/worldmap"}
|
||||
path: {value:"/worldmap"},
|
||||
mapname: {value:""},
|
||||
mapurl: {value:""},
|
||||
mapopt: {value:"", validate:function(v) {try{ v.length===0 || JSON.parse(v); return true;} catch(e) {return false;}}},
|
||||
mapwms: {value:false}
|
||||
},
|
||||
inputs:1,
|
||||
outputs:0,
|
||||
@ -366,6 +378,13 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
}
|
||||
$("#node-input-zoom").spinner({min:0, max:18});
|
||||
$("#node-input-cluster").spinner({min:0, max:19});
|
||||
$("#node-input-layer").on("change",function() {
|
||||
if ($("#node-input-layer").val() === "Custom") {
|
||||
$("#customMap").show();
|
||||
} else {
|
||||
$("#customMap").hide();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@ -405,7 +424,11 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
coords: {value:"false"},
|
||||
showgrid: {value:"false"},
|
||||
allowFileDrop: {value:"false"},
|
||||
path: {value:"/worldmap"}
|
||||
path: {value:"/worldmap"},
|
||||
mapname: {value:""},
|
||||
mapurl: {value:""},
|
||||
mapopt: {value:""},
|
||||
mapwms: {value:false}
|
||||
},
|
||||
inputs:1,
|
||||
outputs:0,
|
||||
@ -438,6 +461,13 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
}
|
||||
$("#node-input-zoom").spinner({min:0, max:18});
|
||||
$("#node-input-cluster").spinner({min:0, max:19});
|
||||
$("#node-input-layer").on("change",function() {
|
||||
if ($("#node-input-layer").val() === "Custom") {
|
||||
$("#customMap").show();
|
||||
} else {
|
||||
$("#customMap").hide();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
35
worldmap.js
35
worldmap.js
@ -1,19 +1,4 @@
|
||||
/* eslint-disable no-inner-declarations */
|
||||
/**
|
||||
* Copyright 2015, 2021 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
**/
|
||||
|
||||
module.exports = function(RED) {
|
||||
"use strict";
|
||||
@ -47,6 +32,13 @@ module.exports = function(RED) {
|
||||
node.showgrid = n.showgrid || "false";
|
||||
node.allowFileDrop = n.allowFileDrop || "false";
|
||||
node.path = n.path || "/worldmap";
|
||||
node.mapname = n.mapname || "";
|
||||
node.mapurl = n.mapurl || "";
|
||||
node.mapopt = n.mapopt || "";
|
||||
node.mapwms = n.mapwms || false;
|
||||
try { node.mapopt2 = JSON.parse(node.mapopt); }
|
||||
catch(e) { node.mapopt2 = null; }
|
||||
|
||||
if (node.path.charAt(0) != "/") { node.path = "/" + node.path; }
|
||||
if (!sockets[node.path]) {
|
||||
var libPath = path.posix.join(RED.settings.httpNodeRoot, node.path, 'leaflet', 'sockjs.min.js');
|
||||
@ -68,11 +60,22 @@ module.exports = function(RED) {
|
||||
client.on('data', function(message) {
|
||||
message = JSON.parse(message);
|
||||
if (message.action === "connected") {
|
||||
var m = {};
|
||||
var c = {init:true};
|
||||
if (node.layer && node.layer == "Custom") {
|
||||
m.name = node.mapname;
|
||||
m.url = node.mapurl;
|
||||
m.opt = node.mapopt2;
|
||||
if (node.mapwms === true) { m.wms = true; }
|
||||
client.write(JSON.stringify({command:{map:m}}));
|
||||
c.layer = m.name;
|
||||
}
|
||||
else {
|
||||
if (node.layer && node.layer.length > 0) { c.layer = node.layer; }
|
||||
}
|
||||
if (node.lat && node.lat.length > 0) { c.lat = node.lat; }
|
||||
if (node.lon && node.lon.length > 0) { c.lon = node.lon; }
|
||||
if (node.zoom && node.zoom.length > 0) { c.zoom = node.zoom; }
|
||||
if (node.layer && node.layer.length > 0) { c.layer = node.layer; }
|
||||
if (node.cluster && node.cluster.length > 0) { c.cluster = node.cluster; }
|
||||
if (node.maxage && node.maxage.length > 0) { c.maxage = node.maxage; }
|
||||
c.showmenu = node.showmenu;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user