diff --git a/summarize.sh b/summarize.sh
index 2205f1d..2d3bfc2 100755
--- a/summarize.sh
+++ b/summarize.sh
@@ -71,7 +71,7 @@ cat << EOF > $OUT
columnDefs: [
//{ targets: [10, 11, 12, 13, 14], "orderable": false},
{ targets: [1], visible: false },
- { targets: [2,3,4,5,6,7,8,9,10], className: 'text-right' },
+ { targets: [2,3,4,5,6,7,8,9,10,11], className: 'text-right' },
//{ targets: '_all', visible: false }
]
});
@@ -203,8 +203,8 @@ cat << EOF > "$MUNOUT"
\$('#list').DataTable({
stateSave: true,
columnDefs: [
- { targets: [11,12,13,14], "orderable": false},
- { targets: [1,3,4,5,6,7,8,9,10], className: 'text-right' },
+ { targets: [2,12,13,14,15], "orderable": false},
+ { targets: [1,3,4,5,6,7,8,9,10,11], className: 'text-right' },
//{ targets: '_all', visible: false }
]
});
@@ -215,6 +215,7 @@ cat << EOF > "$MUNOUT"
City |
#GURS |
+ |
Conflated |
#Dups |
#DLed |
@@ -225,7 +226,7 @@ cat << EOF > "$MUNOUT"
#Add |
%Done |
Preview |
-View |
+ |
.osm |
JOSM |
@@ -260,6 +261,15 @@ do
echo "$CITY | $GURS | " >> "$MUNOUT"
+ # GURS preview
+ # https://geojson.io/#data=data:text/x-url,https%3A%2F%2Fd2ad6b4ur7yvpq.cloudfront.net%2Fnaturalearth-3.3.0%2Fne_50m_land.geojson
+ # Mapshaper alternative: https://github.com/mbloch/mapshaper/wiki/Web-Interface , eg: http://www.mapshaper.org/?files=https://rawgit.com/nvkelso/natural-earth-vector/master/110m_physical/ne_110m_land.shp,https://rawgit.com/nvkelso/natural-earth-vector/master/110m_physical/ne_110m_land.dbf
+ MUNDIRURL=$(echo -n $MUNDIR|sed 's/Č/%25C4%258C/g'|sed 's/Ž/%25C5%25BD/g'|sed 's/Š/%25C5%25A0/g' |sed 's/č/%25C4%258D/g'|sed 's/ž/%25C5%25BE/g'|sed 's/š/%25C5%25A1/g' )
+ BASENAMEURL=$(echo -n $BASENAME|sed 's/Č/%25C4%258C/g'|sed 's/Ž/%25C5%25BD/g'|sed 's/Š/%25C5%25A0/g' |sed 's/č/%25C4%258D/g'|sed 's/ž/%25C5%25BE/g'|sed 's/š/%25C5%25A1/g' )
+
+ GURSPREVIEWGJIO="🌍"
+ echo "$GURSPREVIEWGJIO | " >> "$MUNOUT"
+
if [ ! -f "$DIRNAME/$BASENAME-conflate-log.txt" ]; then
echo -n "?"
echo "Not yet! | | | | | | | | | | | | |
" >> "$MUNOUT"
@@ -272,7 +282,7 @@ if [ ! -f "$DIRNAME/$BASENAME-conflate-log.txt" ]; then
# #Add |
# %Done |
# Preview |
-# View |
+# |
# .osm |
# JOSM |
continue
@@ -371,12 +381,7 @@ fi
PREVIEWGJ="GeoJSON"
echo "$PREVIEWGJ | " >> "$MUNOUT"
- # https://geojson.io/#data=data:text/x-url,https%3A%2F%2Fd2ad6b4ur7yvpq.cloudfront.net%2Fnaturalearth-3.3.0%2Fne_50m_land.geojson
- # Mapshaper alternative: https://github.com/mbloch/mapshaper/wiki/Web-Interface , eg: http://www.mapshaper.org/?files=https://rawgit.com/nvkelso/natural-earth-vector/master/110m_physical/ne_110m_land.shp,https://rawgit.com/nvkelso/natural-earth-vector/master/110m_physical/ne_110m_land.dbf
- MUNDIRURL=$(echo -n $MUNDIR|sed 's/Č/%25C4%258C/g'|sed 's/Ž/%25C5%25BD/g'|sed 's/Š/%25C5%25A0/g' |sed 's/č/%25C4%258D/g'|sed 's/ž/%25C5%25BE/g'|sed 's/š/%25C5%25A1/g' )
- BASENAMEURL=$(echo -n $BASENAME|sed 's/Č/%25C4%258C/g'|sed 's/Ž/%25C5%25BD/g'|sed 's/Š/%25C5%25A0/g' |sed 's/č/%25C4%258D/g'|sed 's/ž/%25C5%25BE/g'|sed 's/š/%25C5%25A1/g' )
-
- PREVIEWGJIO="View"
+ PREVIEWGJIO="🌍"
echo "$PREVIEWGJIO | " >> "$MUNOUT"
OSMLINK=".osm"
@@ -397,6 +402,7 @@ cat << EOF >> "$MUNOUT"
$MUN TOTAL: |
$MUNTOTALGURS |
+ |
$((100*MUNTOTALCONF/MUNTOTALGURS))% |
$MUNTOTALDUPES |
$MUNTOTALDL |