Merge pull request #4 from iiab/master

Sync from iiab/maps:master
iiab · Oct 7, 2020 · 490275f · 490275f
2 parents d8836b3 + 43b511b
commit 490275f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/docs/readme.md b/docs/readme.md
diff --git a/osm-source/pages/installer/build/index.html b/osm-source/pages/installer/build/index.html
@@ -58,15 +58,15 @@ <h3>(3) Click the Map (where you want Hi-Res Satellite Photos)</h3>
           <div id='area-choice'>
             <div>
               <input type='radio' id='small' name='size' value='small'>
-              <label>100 x 100 km ~ 10 MB ~ 10 min download</label>
+              <label>100 x 100 km ~ 5 MB ~ 5 min download</label>
             </div>
             <div>
               <input type='radio' id='medium' name='size' value='medium'>
-              <label>300 x 300 km ~ 100 MB ~ 1 hour download</label>
+              <label>300 x 300 km ~ 50 MB ~ 0.5 hour download</label>
             </div>
             <div>
               <input type='radio' id='large' name='size' checked value='large'>
-              <label>1000 x 1000 km ~ 1 GB ~ 10 hour download</label>
+              <label>1000 x 1000 km ~ 500 MB ~ 5 hour download</label>
             </div>
         </span>
 
@@ -76,7 +76,7 @@ <h3>(4) Install your Satellite Photos</h3>
         <!--/div-->
         <!--<div id='instr'></div>-->
         <h4><div id='cmdline_element' class="command"></div></h4>
-        Hit [Enter] to run it (sudo may request your password!)  You'll know it's downloaded and installed when http://box/maps shows Satellite Photos up to 14 levels of zoom (5 x 5 m pixels) &mdash; instead of just 10 levels of zoom (5 x 5 km pixels) &mdash; within the (square) local region you chose above.  Thanks for your patience!
+        Hit [Enter] to run it (sudo may request your password!)  You'll know it's downloaded and installed when http://box/maps shows Satellite Photos up to 14 levels of zoom (19 x 19 m pixels) &mdash; instead of just 10 levels of zoom (305 x 305 m pixels) &mdash; within the (square) local region you chose above.  Thanks for your patience!
 
         <div class='grower'></div>
         <!--<div class="col-sm-2"><button id="DNLD-SAT" type="button" class="btn btn-lg btn-primary">Download More Satellite Data</button></div>-->

diff --git a/osm-source/pages/viewer/scripts/iiab-extend-sat.py b/osm-source/pages/viewer/scripts/iiab-extend-sat.py
@@ -699,7 +699,7 @@ def download_tiles(src,lat_deg,lon_deg,zoom,radius):
    for tileX in range(tileX_min,tileX_max+1):
       for tileY in range(tileY_min,tileY_max+1):
          if (total_tiles % 10) == 0:
-            print('tileX:%s tileY:%s zoom:%s alredy downloaded: %s added:%s'%(tileX,tileY,zoom,ok,total_tiles))
+            print('tileX:%s tileY:%s zoom:%s already-downloaded:%s added:%s'%(tileX,tileY,zoom,ok,total_tiles))
          tile_exists =  mbTiles.TileExists(zoom,tileX,tileY)
          if tile_exists != None:
             raw = mbTiles.GetTile(zoom, tileX, tileY)