Compare commits
1 Commits
master
...
renovate/f
Author | SHA1 | Date | |
---|---|---|---|
|
81b3a8f0e4 |
@ -17,7 +17,6 @@ func (this *PoiBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, bloc
|
||||
o := mapobjectdb.NewMapObject(mbpos, x, y, z, "poi")
|
||||
o.Attributes["name"] = md["name"]
|
||||
o.Attributes["category"] = md["category"]
|
||||
o.Attributes["addr"] = md["addr"]
|
||||
o.Attributes["url"] = md["url"]
|
||||
o.Attributes["image"] = md["image"]
|
||||
o.Attributes["owner"] = md["owner"]
|
||||
|
@ -7,11 +7,9 @@ function onchange(e){
|
||||
m.route.set("/map/:layerId/:zoom/:lon/:lat", params);
|
||||
}
|
||||
|
||||
|
||||
export default {
|
||||
view: function(){
|
||||
// Display layer selector only if there is choice
|
||||
if (LayerManager.layers.length <= 1)
|
||||
return null;
|
||||
|
||||
const layers = LayerManager.layers.map(layer => m(
|
||||
"option",
|
||||
|
@ -35,11 +35,7 @@ export default AbstractIconOverlay.extend({
|
||||
"\" crossorigin=\"anonymous\" referrerpolicy=\"origin-when-cross-origin\"></div>";
|
||||
}
|
||||
|
||||
innerHTML += "<hr>";
|
||||
if (poi.attributes.addr) {
|
||||
innerHTML += "<b>Address: </b> " + HtmlSanitizer.SanitizeHtml(poi.attributes.addr) + "<br>";
|
||||
}
|
||||
innerHTML += "<b>Owner: </b> " + HtmlSanitizer.SanitizeHtml(poi.attributes.owner) + "<br>";
|
||||
innerHTML += "<hr><b>Owner: </b> " + HtmlSanitizer.SanitizeHtml(poi.attributes.owner) + "<br>";
|
||||
|
||||
return innerHTML;
|
||||
}
|
||||
|
@ -71,7 +71,7 @@ export default L.LayerGroup.extend({
|
||||
|
||||
|
||||
getMaxDisplayedZoom: function(){
|
||||
return 7;
|
||||
return 10;
|
||||
},
|
||||
|
||||
createMarker: function(train){
|
||||
|
@ -58,10 +58,6 @@ export default AbstractGeoJsonOverlay.extend({
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
getMaxDisplayedZoom: function(){
|
||||
return 4;
|
||||
},
|
||||
|
||||
createGeoJson: function(objects){
|
||||
var self = this;
|
||||
|
13
public/package-lock.json
generated
13
public/package-lock.json
generated
@ -32,10 +32,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@fortawesome/fontawesome-free": {
|
||||
"version": "6.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",
|
||||
"integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==",
|
||||
"hasInstallScript": true,
|
||||
"version": "6.6.0",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
|
||||
"integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
@ -734,9 +733,9 @@
|
||||
"integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="
|
||||
},
|
||||
"@fortawesome/fontawesome-free": {
|
||||
"version": "6.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",
|
||||
"integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q=="
|
||||
"version": "6.6.0",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
|
||||
"integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow=="
|
||||
},
|
||||
"@popperjs/core": {
|
||||
"version": "2.11.8",
|
||||
|
@ -9,7 +9,6 @@ type Color struct {
|
||||
R uint8 `json:"r"`
|
||||
G uint8 `json:"g"`
|
||||
B uint8 `json:"b"`
|
||||
A uint8 `json:"a"`
|
||||
}
|
||||
|
||||
func (api *Api) GetColorMapping(resp http.ResponseWriter, req *http.Request) {
|
||||
@ -17,7 +16,7 @@ func (api *Api) GetColorMapping(resp http.ResponseWriter, req *http.Request) {
|
||||
cm := make(map[string]Color)
|
||||
|
||||
for k, v := range api.Context.Colormapping.GetColors() {
|
||||
cm[k] = Color{R: v.R, G: v.G, B: v.B, A: v.A}
|
||||
cm[k] = Color{R: v.R, G: v.G, B: v.B}
|
||||
}
|
||||
|
||||
resp.Header().Add("content-type", "application/json")
|
||||
|
Loading…
Reference in New Issue
Block a user