Fix formatting
This commit is contained in:
parent
1e3c22c159
commit
7b65ef6ee4
@ -1,18 +1,15 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
|
||||
<head>
|
||||
<title>LinuxWorks Minetest Map (unofficial)</title>
|
||||
|
||||
<meta charset="utf-8" />
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<link rel="stylesheet" href="fa/css/all.css" >
|
||||
<link rel="stylesheet" href="fa/css/all.css">
|
||||
<link rel="stylesheet" href="awesomemarkers/leaflet.awesome-markers.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin=""/>
|
||||
<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js" integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew==" crossorigin=""></script>
|
||||
<script src="awesomemarkers/leaflet.awesome-markers.js"></script>
|
||||
</head>
|
||||
</head>
|
||||
<body style="position: absolute; padding: 0px; margin: 0px; width:100%; height:100%;">
|
||||
<div id="mapid" style="width: 100%; height: 100%;"></div>
|
||||
<style>
|
||||
@ -20,17 +17,17 @@
|
||||
background-color: transparent;
|
||||
border: transparent;
|
||||
box-shadow: none;
|
||||
|
||||
font-weight: bold;
|
||||
font-size: 14pt;
|
||||
opacity:1.0;
|
||||
opacity: 1.0;
|
||||
color: white;
|
||||
text-shadow: 0px 0px 5px black;
|
||||
}
|
||||
|
||||
a.new {
|
||||
color: red;
|
||||
}
|
||||
</style>
|
||||
<script src="mapscript.js"> </script>
|
||||
<script src="mapscript.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
// Projection fix from: https://gis.stackexchange.com/questions/200865/leaflet-crs-simple-custom-scale
|
||||
var factorx = 1/256 * 4;
|
||||
var factorx = 1 / 256 * 4;
|
||||
var factory = factorx;
|
||||
var originx = 7000;
|
||||
var originy = 7000;
|
||||
@ -7,7 +7,7 @@ var zoom_level_real = 6;
|
||||
|
||||
L.CRS.pr = L.extend({}, L.CRS.Simple, {
|
||||
projection: L.Projection.LonLat,
|
||||
transformation: new L.Transformation(factorx, factorx * originx, -factory, factory * originy),
|
||||
transformation: new L.Transformation(factorx,factorx * originx,-factory,factory * originy),
|
||||
|
||||
scale: function(zoom) {
|
||||
return Math.pow(2, zoom);
|
||||
@ -18,8 +18,8 @@ L.CRS.pr = L.extend({}, L.CRS.Simple, {
|
||||
},
|
||||
|
||||
distance: function(latlng1, latlng2) {
|
||||
var dx = latlng2.lng - latlng1.lng,
|
||||
dy = latlng2.lat - latlng1.lat;
|
||||
var dx = latlng2.lng - latlng1.lng
|
||||
, dy = latlng2.lat - latlng1.lat;
|
||||
|
||||
return Math.sqrt(dx * dx + dy * dy);
|
||||
},
|
||||
@ -35,7 +35,7 @@ var mapheight = 16384;
|
||||
var mapwidth = mapheight;
|
||||
var sw = mymap.unproject([0, 0], zoom_level_real);
|
||||
var ne = mymap.unproject([mapwidth, mapheight], zoom_level_real);
|
||||
var layerbounds = new L.LatLngBounds(sw, ne);
|
||||
var layerbounds = new L.LatLngBounds(sw,ne);
|
||||
|
||||
var layers = L.control.layers({}, {}).addTo(mymap);
|
||||
|
||||
@ -48,7 +48,7 @@ function load_svg(name, url, active=1) {
|
||||
svgElement.setAttribute('xmlns', "http://www.w3.org/2000/svg");
|
||||
svgElement.setAttribute('viewBox', "0 0 16384 16384");
|
||||
svgElement.innerHTML = xhttp_ps.responseText;
|
||||
var svgElementBounds = [ [ 0, 0 ], [ 1000, 1000 ] ];
|
||||
var svgElementBounds = [[0, 0], [1000, 1000]];
|
||||
var overlay = L.svgOverlay(svgElement, svgElementBounds);
|
||||
layers.addOverlay(overlay, name);
|
||||
if (active)
|
||||
@ -58,7 +58,8 @@ function load_svg(name, url, active=1) {
|
||||
alert("Error: Could not load SVG map layer (" + name + ")");
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
;
|
||||
xhttp_ps.open("GET", url, true);
|
||||
xhttp_ps.send();
|
||||
}
|
||||
@ -70,8 +71,7 @@ function load_tiles(name, id) {
|
||||
minNativeZoom: 0,
|
||||
minZoom: 0,
|
||||
noWrap: true,
|
||||
attribution: 'Map data © <a href="https://wiki.linux-forks.de/mediawiki/index.php/Maps">Linux-Forks</a>, ' +
|
||||
'All rights reserved, ',
|
||||
attribution: 'Map data © <a href="https://wiki.linux-forks.de/mediawiki/index.php/Maps">Linux-Forks</a>, ' + 'All rights reserved, ',
|
||||
id: id,
|
||||
tileSize: 256,
|
||||
zoomOffset: 0,
|
||||
@ -82,29 +82,33 @@ function load_tiles(name, id) {
|
||||
return satellite;
|
||||
}
|
||||
|
||||
|
||||
|
||||
function load_geojson(name, url, iconname, iconcolor,active=1) {
|
||||
function load_geojson(name, url, iconname, iconcolor, active=1) {
|
||||
var xhttp_ps = new XMLHttpRequest();
|
||||
xhttp_ps.onreadystatechange = function() {
|
||||
if (this.readyState == 4) {
|
||||
if (this.status == 200) {
|
||||
var geojson = L.geoJSON(JSON.parse(xhttp_ps.responseText), {
|
||||
onEachFeature: function (feature, layer) {
|
||||
onEachFeature: function(feature, layer) {
|
||||
label = String(feature.properties.name)
|
||||
layer.bindPopup(
|
||||
'<h1><a href="https://wiki.linux-forks.de/mediawiki/index.php/'+feature.properties.name+'">'+feature.properties.name+'</a> ('+feature.geometry.coordinates+')</h1>'+
|
||||
'<p><img style="width:100%" src="' + feature.properties.image + '"></p>' +
|
||||
'<p>'+feature.properties.description+'</p>'
|
||||
);
|
||||
layer.bindTooltip(label, {permanent: true, direction: "center", className: "city-names"}).openTooltip();
|
||||
layer.bindPopup('<h1><a href="https://wiki.linux-forks.de/mediawiki/index.php/' + feature.properties.name + '">' + feature.properties.name + '</a> (' + feature.geometry.coordinates + ')</h1>' + '<p><img style="width:100%" src="' + feature.properties.image + '"></p>' + '<p>' + feature.properties.description + '</p>');
|
||||
layer.bindTooltip(label, {
|
||||
permanent: true,
|
||||
direction: "center",
|
||||
className: "city-names"
|
||||
}).openTooltip();
|
||||
},
|
||||
pointToLayer: function(feature,latlng){
|
||||
pointToLayer: function(feature, latlng) {
|
||||
label = String(feature.properties.name)
|
||||
return new L.marker(latlng, {icon: L.AwesomeMarkers.icon({
|
||||
return new L.marker(latlng,{
|
||||
icon: L.AwesomeMarkers.icon({
|
||||
icon: iconname,
|
||||
markerColor: iconcolor
|
||||
})}).bindTooltip(label, {permanent: false, direction: "center", opacity: 0.7}).openTooltip();
|
||||
})
|
||||
}).bindTooltip(label, {
|
||||
permanent: false,
|
||||
direction: "center",
|
||||
opacity: 0.7
|
||||
}).openTooltip();
|
||||
}
|
||||
});
|
||||
layers.addOverlay(geojson, name);
|
||||
@ -115,7 +119,8 @@ function load_geojson(name, url, iconname, iconcolor,active=1) {
|
||||
alert("Error: Could not load geojson map layer (" + name + ").");
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
;
|
||||
xhttp_ps.open("GET", url, true);
|
||||
xhttp_ps.send();
|
||||
}
|
||||
@ -145,10 +150,7 @@ var baseballIcon = L.AwesomeMarkers.icon({
|
||||
});
|
||||
|
||||
function onMapClick(e) {
|
||||
popup
|
||||
.setLatLng(e.latlng)
|
||||
.setContent("You clicked the map at " + e.latlng.toString())
|
||||
.openOn(mymap);
|
||||
popup.setLatLng(e.latlng).setContent("You clicked the map at " + e.latlng.toString()).openOn(mymap);
|
||||
}
|
||||
|
||||
mymap.on('click', onMapClick);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user