summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Koch <markus@notsyncing.net>2021-02-26 20:08:17 +0100
committerMarkus Koch <markus@notsyncing.net>2021-02-26 20:08:17 +0100
commit1bd7cb11602121dda9a7966ca18755fd9fa2287a (patch)
treebfb4cc212fc25e749e6192bb36b5444705c8d97b
parent3b41beec7b4dc7d5cfad827b335e6f08b14a1e39 (diff)
downloadlifomapserver-1bd7cb11602121dda9a7966ca18755fd9fa2287a.tar.gz
lifomapserver-1bd7cb11602121dda9a7966ca18755fd9fa2287a.tar.bz2
lifomapserver-1bd7cb11602121dda9a7966ca18755fd9fa2287a.zip
htdocs: Fix dependencies
-rw-r--r--.gitmodules6
m---------htdocs/awesomemarkers0
m---------htdocs/fa0
-rw-r--r--htdocs/index.html6
4 files changed, 9 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index 36e7ca9..daf70e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
[submodule "lifo-dijkstraserv"]
path = lifo-dijkstraserv
url = https://notsyncing.net:8080/markus/lifo-dijkstraserv.git
+[submodule "htdocs/fa"]
+ path = htdocs/fa
+ url = https://github.com/FortAwesome/Font-Awesome
+[submodule "htdocs/awesomemarkers"]
+ path = htdocs/awesomemarkers
+ url = https://github.com/lvoogdt/Leaflet.awesome-markers
diff --git a/htdocs/awesomemarkers b/htdocs/awesomemarkers
new file mode 160000
+Subproject 4fcacdfc82ed58f0173062851a4cda713845df8
diff --git a/htdocs/fa b/htdocs/fa
new file mode 160000
+Subproject fcec2d1b01ff069ac10500ac42e4478d20d21f4
diff --git a/htdocs/index.html b/htdocs/index.html
index bfb4313..9dfb71e 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -5,10 +5,10 @@
<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="awesomemarkers/leaflet.awesome-markers.css">
+ <link rel="stylesheet" href="awesomemarkers/dist/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>
+ <script src="awesomemarkers/dist/leaflet.awesome-markers.js"></script>
<!-- Streets -->
<script src='leafletjs/ctxtextpath.js'></script>
<script src='leafletjs/L.LabelTextCollision.js'></script>
@@ -48,7 +48,7 @@
-ms-interpolation-mode: nearest-neighbor; /* IE8+ */
}
</style>
- <script src="mapscript.js"></script>
+ <script src="mapscript.js?v3"></script>
<script src="streeteditor.js"></script>
</body>
</html>