move some stuff around, add 2 rows to sprite png

kevdel · Nov 30, 2020 · 722c6cc · 722c6cc
1 parent f5031f2
commit 722c6cc
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 5 deletions.
diff --git a/html/early.js b/html/early.js
@@ -33,8 +33,6 @@ let traceRate = 0;
 let _aircraft_type_cache = null;
 let tfrs = false;
 
-let databaseFolder = "db2";
-
 let uuid = null;
 
 try {

diff --git a/html/images/sprites001.png b/html/images/sprites001.png
diff --git a/html/images/sprites002.png → html/images/sprites003.png b/html/images/sprites002.png → html/images/sprites003.png
diff --git a/html/index.html b/html/index.html
@@ -897,6 +897,7 @@
 
     <div id="container_splitter"></div>
 
+    <script>let databaseFolder = "db2";</script>
     <script src="libs/jquery-3.5.1.min.js"></script>
     <script src="libs/elm-pep-01.js"></script>
     <script src="libs/jquery-ui-1.12.1.min.js"></script>

diff --git a/html/markers.js b/html/markers.js
@@ -1120,7 +1120,7 @@ function svgShapeToURI(shape, fillColor, strokeColor, strokeWidth, scale){
 
 let glIconSize = 72;
 let glImapWidth = 8;
-let glImapHeight = 9;
+let glImapHeight = 11;
 
 let refCross = {
     w: glIconSize,

diff --git a/html/script.js b/html/script.js
@@ -1245,7 +1245,7 @@ function webglAddLayer() {
         let glStyle = {
             symbol: {
                 symbolType: 'image',
-                src: 'images/sprites002.png',
+                src: 'images/sprites003.png',
                 size: [ 'get', 'size' ],
                 offset: [0, 0],
                 textureCoord: [ 'array',

diff --git a/install.sh b/install.sh
@@ -218,7 +218,7 @@ do
 
     cp -r -T html "$TMP"
     cp -r -T "$ipath/git-db/db" "$TMP/db-$DB_VERSION"
-    sed -i -e "s/let databaseFolder = .*/let databaseFolder = \"db-$DB_VERSION\";/" "$TMP/early.js"
+    sed -i -e "s/let databaseFolder = .*;/let databaseFolder = \"db-$DB_VERSION\";/" "$TMP/index.html"
     echo "{ \"tar1090Version\": \"$TAR_VERSION\", \"databaseVersion\": \"$DB_VERSION\" }" > "$TMP/version.json"
 
     # keep some stuff around