CACHE TYPE icons overhaul

Stage 1: graphics resources Reference: opencaching#860 - removed stale and unused files (22x22*, 24x24*, usb*, mystery*) - added graphics for new cache types (benchmark, bitcache, challenge, guestbook) - created icon resources /public/images/cache/res - created icon build script - moved KML build resources and script to /public/images/cache/res (/public/images/cache/kml now contains only production images) - updated KML icons build script From now on it is easy to generate the entire iconset from res/ directory. Just enable each cache type icon in res/__cache_types.txt. Also, KML icons will be generated from the same set.
andrixnet · Jul 3, 2019 · 9c5f0c5 · 9c5f0c5
1 parent a7c5a9b
commit 9c5f0c5
Show file tree

Hide file tree

Showing 191 changed files with 202 additions and 34 deletions.
diff --git a/public/images/cache/16x16-benchmark-found.png b/public/images/cache/16x16-benchmark-found.png
diff --git a/public/images/cache/16x16-benchmark-s-owner.png b/public/images/cache/16x16-benchmark-s-owner.png
diff --git a/public/images/cache/16x16-benchmark.png b/public/images/cache/16x16-benchmark.png
diff --git a/public/images/cache/16x16-bitcache-found.png b/public/images/cache/16x16-bitcache-found.png
diff --git a/public/images/cache/16x16-bitcache-s-owner.png b/public/images/cache/16x16-bitcache-s-owner.png
diff --git a/public/images/cache/16x16-bitcache.png b/public/images/cache/16x16-bitcache.png
diff --git a/public/images/cache/16x16-challenge-found.png b/public/images/cache/16x16-challenge-found.png
diff --git a/public/images/cache/16x16-challenge-s-owner.png b/public/images/cache/16x16-challenge-s-owner.png
diff --git a/public/images/cache/16x16-challenge.png b/public/images/cache/16x16-challenge.png
diff --git a/public/images/cache/16x16-guestbook-found.png b/public/images/cache/16x16-guestbook-found.png
diff --git a/public/images/cache/16x16-guestbook-s-owner.png b/public/images/cache/16x16-guestbook-s-owner.png
diff --git a/public/images/cache/16x16-guestbook.png b/public/images/cache/16x16-guestbook.png
diff --git a/public/images/cache/22x22-challenge.png b/public/images/cache/22x22-challenge.png
diff --git a/public/images/cache/22x22-event.png b/public/images/cache/22x22-event.png
diff --git a/public/images/cache/22x22-guestbook.png b/public/images/cache/22x22-guestbook.png
diff --git a/public/images/cache/22x22-moving.png b/public/images/cache/22x22-moving.png
diff --git a/public/images/cache/22x22-multi.png b/public/images/cache/22x22-multi.png
diff --git a/public/images/cache/22x22-owncache.png b/public/images/cache/22x22-owncache.png
diff --git a/public/images/cache/22x22-podcache.png b/public/images/cache/22x22-podcache.png
diff --git a/public/images/cache/22x22-quiz.png b/public/images/cache/22x22-quiz.png
diff --git a/public/images/cache/22x22-traditional.png b/public/images/cache/22x22-traditional.png
diff --git a/public/images/cache/22x22-unknown.png b/public/images/cache/22x22-unknown.png
diff --git a/public/images/cache/22x22-virtual.png b/public/images/cache/22x22-virtual.png
diff --git a/public/images/cache/22x22-webcam.png b/public/images/cache/22x22-webcam.png
diff --git a/public/images/cache/24x24-challenge.png b/public/images/cache/24x24-challenge.png
diff --git a/public/images/cache/24x24-event.png b/public/images/cache/24x24-event.png
diff --git a/public/images/cache/24x24-guestbook.png b/public/images/cache/24x24-guestbook.png
diff --git a/public/images/cache/24x24-moving.png b/public/images/cache/24x24-moving.png
diff --git a/public/images/cache/24x24-multi.png b/public/images/cache/24x24-multi.png
diff --git a/public/images/cache/24x24-owncache.png b/public/images/cache/24x24-owncache.png
diff --git a/public/images/cache/24x24-podcache.png b/public/images/cache/24x24-podcache.png
diff --git a/public/images/cache/24x24-quiz.png b/public/images/cache/24x24-quiz.png
diff --git a/public/images/cache/24x24-traditional.png b/public/images/cache/24x24-traditional.png
diff --git a/public/images/cache/24x24-unknown.png b/public/images/cache/24x24-unknown.png
diff --git a/public/images/cache/24x24-virtual.png b/public/images/cache/24x24-virtual.png
diff --git a/public/images/cache/24x24-webcam.png b/public/images/cache/24x24-webcam.png
diff --git a/public/images/cache/benchmark-a-dnf.png b/public/images/cache/benchmark-a-dnf.png
diff --git a/public/images/cache/benchmark-a-found.png b/public/images/cache/benchmark-a-found.png
diff --git a/public/images/cache/benchmark-a-owner.png b/public/images/cache/benchmark-a-owner.png
diff --git a/public/images/cache/benchmark-a.png b/public/images/cache/benchmark-a.png
diff --git a/public/images/cache/benchmark-d-dnf.png b/public/images/cache/benchmark-d-dnf.png
diff --git a/public/images/cache/benchmark-d-found.png b/public/images/cache/benchmark-d-found.png
diff --git a/public/images/cache/benchmark-d-owner.png b/public/images/cache/benchmark-d-owner.png
diff --git a/public/images/cache/benchmark-d.png b/public/images/cache/benchmark-d.png
diff --git a/public/images/cache/benchmark-i-bw.png b/public/images/cache/benchmark-i-bw.png
diff --git a/public/images/cache/benchmark-i.png b/public/images/cache/benchmark-i.png
diff --git a/public/images/cache/benchmark-n-dnf.png b/public/images/cache/benchmark-n-dnf.png
diff --git a/public/images/cache/benchmark-n-found.png b/public/images/cache/benchmark-n-found.png
diff --git a/public/images/cache/benchmark-n-owner.png b/public/images/cache/benchmark-n-owner.png
diff --git a/public/images/cache/benchmark-n.png b/public/images/cache/benchmark-n.png
diff --git a/public/images/cache/benchmark-s-dnf.png b/public/images/cache/benchmark-s-dnf.png
diff --git a/public/images/cache/benchmark-s-found.png b/public/images/cache/benchmark-s-found.png
diff --git a/public/images/cache/benchmark-s-owner.png b/public/images/cache/benchmark-s-owner.png
diff --git a/public/images/cache/benchmark-s.png b/public/images/cache/benchmark-s.png
diff --git a/public/images/cache/benchmark.png b/public/images/cache/benchmark.png
diff --git a/public/images/cache/bitcache-a-dnf.png b/public/images/cache/bitcache-a-dnf.png
diff --git a/public/images/cache/bitcache-a-found.png b/public/images/cache/bitcache-a-found.png
diff --git a/public/images/cache/bitcache-a-owner.png b/public/images/cache/bitcache-a-owner.png
diff --git a/public/images/cache/bitcache-a.png b/public/images/cache/bitcache-a.png
diff --git a/public/images/cache/bitcache-d-dnf.png b/public/images/cache/bitcache-d-dnf.png
diff --git a/public/images/cache/bitcache-d-found.png b/public/images/cache/bitcache-d-found.png
diff --git a/public/images/cache/bitcache-d-owner.png b/public/images/cache/bitcache-d-owner.png
diff --git a/public/images/cache/bitcache-d.png b/public/images/cache/bitcache-d.png
diff --git a/public/images/cache/bitcache-i-bw.png b/public/images/cache/bitcache-i-bw.png
diff --git a/public/images/cache/bitcache-i.png b/public/images/cache/bitcache-i.png
diff --git a/public/images/cache/bitcache-n-dnf.png b/public/images/cache/bitcache-n-dnf.png
diff --git a/public/images/cache/bitcache-n-found.png b/public/images/cache/bitcache-n-found.png
diff --git a/public/images/cache/bitcache-n-owner.png b/public/images/cache/bitcache-n-owner.png
diff --git a/public/images/cache/bitcache-n.png b/public/images/cache/bitcache-n.png
diff --git a/public/images/cache/bitcache-s-dnf.png b/public/images/cache/bitcache-s-dnf.png
diff --git a/public/images/cache/bitcache-s-found.png b/public/images/cache/bitcache-s-found.png
diff --git a/public/images/cache/bitcache-s-owner.png b/public/images/cache/bitcache-s-owner.png
diff --git a/public/images/cache/bitcache-s.png b/public/images/cache/bitcache-s.png
diff --git a/public/images/cache/bitcache.png b/public/images/cache/bitcache.png
diff --git a/public/images/cache/challenge-a-dnf.png b/public/images/cache/challenge-a-dnf.png
diff --git a/public/images/cache/challenge-a-found.png b/public/images/cache/challenge-a-found.png
diff --git a/public/images/cache/challenge-a-owner.png b/public/images/cache/challenge-a-owner.png
diff --git a/public/images/cache/challenge-a.png b/public/images/cache/challenge-a.png
diff --git a/public/images/cache/challenge-d-dnf.png b/public/images/cache/challenge-d-dnf.png
diff --git a/public/images/cache/challenge-d-found.png b/public/images/cache/challenge-d-found.png
diff --git a/public/images/cache/challenge-d-owner.png b/public/images/cache/challenge-d-owner.png
diff --git a/public/images/cache/challenge-d.png b/public/images/cache/challenge-d.png
diff --git a/public/images/cache/challenge-i-bw.png b/public/images/cache/challenge-i-bw.png
diff --git a/public/images/cache/challenge-i.png b/public/images/cache/challenge-i.png
diff --git a/public/images/cache/challenge-n-dnf.png b/public/images/cache/challenge-n-dnf.png
diff --git a/public/images/cache/challenge-n-found.png b/public/images/cache/challenge-n-found.png
diff --git a/public/images/cache/challenge-n-owner.png b/public/images/cache/challenge-n-owner.png
diff --git a/public/images/cache/challenge-n.png b/public/images/cache/challenge-n.png
diff --git a/public/images/cache/challenge-s-dnf.png b/public/images/cache/challenge-s-dnf.png
diff --git a/public/images/cache/challenge-s-found.png b/public/images/cache/challenge-s-found.png
diff --git a/public/images/cache/challenge-s-owner.png b/public/images/cache/challenge-s-owner.png
diff --git a/public/images/cache/challenge-s.png b/public/images/cache/challenge-s.png
diff --git a/public/images/cache/challenge.png b/public/images/cache/challenge.png
diff --git a/public/images/cache/guestbook-a-dnf.png b/public/images/cache/guestbook-a-dnf.png
diff --git a/public/images/cache/guestbook-a-found.png b/public/images/cache/guestbook-a-found.png
diff --git a/public/images/cache/guestbook-a-owner.png b/public/images/cache/guestbook-a-owner.png
diff --git a/public/images/cache/guestbook-a.png b/public/images/cache/guestbook-a.png
diff --git a/public/images/cache/guestbook-d-dnf.png b/public/images/cache/guestbook-d-dnf.png
diff --git a/public/images/cache/guestbook-d-found.png b/public/images/cache/guestbook-d-found.png
diff --git a/public/images/cache/guestbook-d-owner.png b/public/images/cache/guestbook-d-owner.png
diff --git a/public/images/cache/guestbook-d.png b/public/images/cache/guestbook-d.png
diff --git a/public/images/cache/guestbook-i-bw.png b/public/images/cache/guestbook-i-bw.png
diff --git a/public/images/cache/guestbook-i.png b/public/images/cache/guestbook-i.png
diff --git a/public/images/cache/guestbook-n-dnf.png b/public/images/cache/guestbook-n-dnf.png
diff --git a/public/images/cache/guestbook-n-found.png b/public/images/cache/guestbook-n-found.png
diff --git a/public/images/cache/guestbook-n-owner.png b/public/images/cache/guestbook-n-owner.png
diff --git a/public/images/cache/guestbook-n.png b/public/images/cache/guestbook-n.png
diff --git a/public/images/cache/guestbook-s-dnf.png b/public/images/cache/guestbook-s-dnf.png
diff --git a/public/images/cache/guestbook-s-found.png b/public/images/cache/guestbook-s-found.png
diff --git a/public/images/cache/guestbook-s-owner.png b/public/images/cache/guestbook-s-owner.png
diff --git a/public/images/cache/guestbook-s.png b/public/images/cache/guestbook-s.png
diff --git a/public/images/cache/guestbook.png b/public/images/cache/guestbook.png
diff --git a/public/images/cache/kml/benchmark_kml-archived.png b/public/images/cache/kml/benchmark_kml-archived.png
diff --git a/public/images/cache/kml/benchmark_kml-disabled.png b/public/images/cache/kml/benchmark_kml-disabled.png
diff --git a/public/images/cache/kml/benchmark_kml.png b/public/images/cache/kml/benchmark_kml.png
diff --git a/public/images/cache/kml/bitcache_kml-archived.png b/public/images/cache/kml/bitcache_kml-archived.png
diff --git a/public/images/cache/kml/bitcache_kml-disabled.png b/public/images/cache/kml/bitcache_kml-disabled.png
diff --git a/public/images/cache/kml/bitcache_kml.png b/public/images/cache/kml/bitcache_kml.png
diff --git a/public/images/cache/kml/challenge_kml-archived.png b/public/images/cache/kml/challenge_kml-archived.png
diff --git a/public/images/cache/kml/challenge_kml-disabled.png b/public/images/cache/kml/challenge_kml-disabled.png
diff --git a/public/images/cache/kml/challenge_kml.png b/public/images/cache/kml/challenge_kml.png
diff --git a/public/images/cache/kml/convert-cache-icons-4-kml.sh b/public/images/cache/kml/convert-cache-icons-4-kml.sh
diff --git a/public/images/cache/kml/event_kml-archived.png b/public/images/cache/kml/event_kml-archived.png
diff --git a/public/images/cache/kml/event_kml-disabled.png b/public/images/cache/kml/event_kml-disabled.png
diff --git a/public/images/cache/kml/event_kml.png b/public/images/cache/kml/event_kml.png
diff --git a/public/images/cache/kml/guestbook_kml-archived.png b/public/images/cache/kml/guestbook_kml-archived.png
diff --git a/public/images/cache/kml/guestbook_kml-disabled.png b/public/images/cache/kml/guestbook_kml-disabled.png
diff --git a/public/images/cache/kml/guestbook_kml.png b/public/images/cache/kml/guestbook_kml.png
diff --git a/public/images/cache/kml/moving_kml-archived.png b/public/images/cache/kml/moving_kml-archived.png
diff --git a/public/images/cache/kml/moving_kml-disabled.png b/public/images/cache/kml/moving_kml-disabled.png
diff --git a/public/images/cache/kml/moving_kml.png b/public/images/cache/kml/moving_kml.png
diff --git a/public/images/cache/kml/multi_kml-archived.png b/public/images/cache/kml/multi_kml-archived.png
diff --git a/public/images/cache/kml/multi_kml-disabled.png b/public/images/cache/kml/multi_kml-disabled.png
diff --git a/public/images/cache/kml/multi_kml.png b/public/images/cache/kml/multi_kml.png
diff --git a/public/images/cache/kml/owncache_kml-archived.png b/public/images/cache/kml/owncache_kml-archived.png
diff --git a/public/images/cache/kml/owncache_kml-disabled.png b/public/images/cache/kml/owncache_kml-disabled.png
diff --git a/public/images/cache/kml/owncache_kml.png b/public/images/cache/kml/owncache_kml.png
diff --git a/public/images/cache/kml/quiz_kml-archived.png b/public/images/cache/kml/quiz_kml-archived.png
diff --git a/public/images/cache/kml/quiz_kml-disabled.png b/public/images/cache/kml/quiz_kml-disabled.png
diff --git a/public/images/cache/kml/quiz_kml.png b/public/images/cache/kml/quiz_kml.png
diff --git a/public/images/cache/kml/traditional_kml-archived.png b/public/images/cache/kml/traditional_kml-archived.png
diff --git a/public/images/cache/kml/traditional_kml-disabled.png b/public/images/cache/kml/traditional_kml-disabled.png
diff --git a/public/images/cache/kml/traditional_kml.png b/public/images/cache/kml/traditional_kml.png
diff --git a/public/images/cache/kml/virtual_kml-archived.png b/public/images/cache/kml/virtual_kml-archived.png
diff --git a/public/images/cache/kml/virtual_kml-disabled.png b/public/images/cache/kml/virtual_kml-disabled.png
diff --git a/public/images/cache/kml/virtual_kml.png b/public/images/cache/kml/virtual_kml.png
diff --git a/public/images/cache/kml/webcam_kml-archived.png b/public/images/cache/kml/webcam_kml-archived.png
diff --git a/public/images/cache/kml/webcam_kml-disabled.png b/public/images/cache/kml/webcam_kml-disabled.png
diff --git a/public/images/cache/kml/webcam_kml.png b/public/images/cache/kml/webcam_kml.png
diff --git a/public/images/cache/mystery-i-bw.png b/public/images/cache/mystery-i-bw.png
diff --git a/public/images/cache/mystery-i.png b/public/images/cache/mystery-i.png
diff --git a/public/images/cache/preview.png b/public/images/cache/preview.png
diff --git a/public/images/cache/res/__cache_types.txt b/public/images/cache/res/__cache_types.txt
@@ -0,0 +1,23 @@
+# cache types
+#
+# Format: cache_type_definition (according to GeoCacheCommons) {space} icon name
+# Lines starting with # are comments
+# Empty lines are ignored
+
+# All files 32x32 PNG or SVG images
+
+TYPE_OTHERTYPE  unknown
+TYPE_TRADITIONAL traditional
+TYPE_MULTICACHE multi
+TYPE_VIRTUAL virtual
+TYPE_WEBCAM webcam
+TYPE_EVENT event
+TYPE_QUIZ quiz
+TYPE_MOVING moving
+#TYPE_GEOPATHFINAL podcache ###TODO: old -podcast- type?
+TYPE_OWNCACHE owncache
+
+TYPE_GUESTBOOK guestbook
+TYPE_BITCACHE bitcache
+TYPE_BENCHMARK benchmark
+TYPE_CHALLENGE challenge
diff --git a/...images/cache/kml/__marker_archived_oc.png → ...ic/images/cache/res/__kml_archived_oc.png b/...images/cache/kml/__marker_archived_oc.png → ...ic/images/cache/res/__kml_archived_oc.png
diff --git a/...images/cache/kml/__marker_disabled_oc.png → ...ic/images/cache/res/__kml_disabled_oc.png b/...images/cache/kml/__marker_disabled_oc.png → ...ic/images/cache/res/__kml_disabled_oc.png
diff --git a/public/images/cache/kml/__marker_oc.png → public/images/cache/res/__kml_oc.png b/public/images/cache/kml/__marker_oc.png → public/images/cache/res/__kml_oc.png
diff --git a/public/images/cache/res/_cache_type__benchmark.png b/public/images/cache/res/_cache_type__benchmark.png
diff --git a/public/images/cache/res/_cache_type__bitcache.png b/public/images/cache/res/_cache_type__bitcache.png
diff --git a/public/images/cache/res/_cache_type__challenge.png b/public/images/cache/res/_cache_type__challenge.png
diff --git a/public/images/cache/res/_cache_type__event.png b/public/images/cache/res/_cache_type__event.png
diff --git a/public/images/cache/res/_cache_type__guestbook.png b/public/images/cache/res/_cache_type__guestbook.png
diff --git a/public/images/cache/res/_cache_type__moving.png b/public/images/cache/res/_cache_type__moving.png
diff --git a/public/images/cache/res/_cache_type__multi.png b/public/images/cache/res/_cache_type__multi.png
diff --git a/public/images/cache/res/_cache_type__owncache.png b/public/images/cache/res/_cache_type__owncache.png
diff --git a/public/images/cache/res/_cache_type__podcache.png b/public/images/cache/res/_cache_type__podcache.png
diff --git a/public/images/cache/res/_cache_type__quiz.png b/public/images/cache/res/_cache_type__quiz.png
diff --git a/public/images/cache/res/_cache_type__traditional.png b/public/images/cache/res/_cache_type__traditional.png
diff --git a/public/images/cache/res/_cache_type__unknown.png b/public/images/cache/res/_cache_type__unknown.png
diff --git a/public/images/cache/res/_cache_type__virtual.png b/public/images/cache/res/_cache_type__virtual.png
diff --git a/public/images/cache/res/_cache_type__webcam.png b/public/images/cache/res/_cache_type__webcam.png
diff --git a/public/images/cache/res/_overlay__-a.png b/public/images/cache/res/_overlay__-a.png
diff --git a/public/images/cache/res/_overlay__-d.png b/public/images/cache/res/_overlay__-d.png
diff --git a/public/images/cache/res/_overlay__-dnf.png b/public/images/cache/res/_overlay__-dnf.png
diff --git a/public/images/cache/res/_overlay__-found.png b/public/images/cache/res/_overlay__-found.png
diff --git a/public/images/cache/res/_overlay__-i.png b/public/images/cache/res/_overlay__-i.png
diff --git a/public/images/cache/res/_overlay__-n.png b/public/images/cache/res/_overlay__-n.png
diff --git a/public/images/cache/res/_overlay__-owner.png b/public/images/cache/res/_overlay__-owner.png
diff --git a/public/images/cache/res/make-cache-icons.sh b/public/images/cache/res/make-cache-icons.sh
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+# Compose standard cache icons (in res directory)
+# to required opencaching-pl iconset
+
+
+SRC="."
+DST=".."
+PWD_CHECK="res"
+SKIP_EXISTING=1
+
+CACHE_TYPES=$(cat __cache_types.txt | grep -vE "^#|^\s*$" | cut -f2 -d' ')
+
+_FILENAME() {
+    INPUT="$1"
+    OUTPUT=$(echo ${INPUT}.* | grep -iE "png|svg" | sort -r | head -n 1)
+    echo "${OUTPUT}"
+}
+
+_OVERLAY_A="-a"
+_OVERLAY_D="-d"
+_OVERLAY_DNF="-dnf"
+_OVERLAY_FOUND="-found"
+_OVERLAY_I="-i"
+_OVERLAY_N="-n"
+_OVERLAY_S="-s"
+_OVERLAY_OWNER="-owner"
+
+OVERLAY_A=$(_FILENAME "_overlay__${_OVERLAY_A}")
+OVERLAY_D=$(_FILENAME "_overlay__${_OVERLAY_D}")
+OVERLAY_DNF=$(_FILENAME "_overlay__${_OVERLAY_DNF}")
+OVERLAY_FOUND=$(_FILENAME "_overlay__${_OVERLAY_FOUND}")
+OVERLAY_I=$(_FILENAME "_overlay__${_OVERLAY_I}")
+OVERLAY_N=$(_FILENAME "_overlay__${_OVERLAY_N}")
+OVERLAY_OWNER=$(_FILENAME "_overlay__${_OVERLAY_OWNER}")
+
+usage() {
+    cat << EOM
+    usage: make-cache-iconset.sh [options]
+
+    OPTIONS:
+    -o              overwrite existing icons (default skip)
+    -h              show this message
+
+EOM
+}
+
+if [ "$(basename $(pwd))" != "${PWD_CHECK}" ]; then
+    echo "Error: must be called inside '${PWD_CHECK}' directory. Stop."
+    echo
+    exit 1
+fi  
+
+while getopts "oh" OPTS; do
+    case $OPTS in
+        o)
+            SKIP_EXISTING=
+            ;;
+        h)
+            usage
+            exit 1
+            ;;
+        \?)
+            echo "use $0 -h for help"
+            exit
+            ;;
+    esac
+done
+
+# Compose icons
+function composeICONS() {
+    NAME="$1"
+    CACHE=$(_FILENAME "_cache_type__$1")
+
+    if [ ! -f "${SRC}/${CACHE}" ]; then
+        echo "Error: file not found ${CACHE}!"
+        exit 1
+    fi
+    rm -f "${DST}/${NAME}*"
+
+    convert "${SRC}/${CACHE}" png32:"${DST}/${NAME}.png"
+
+    convert "${SRC}/${CACHE}" -resize 16x16 png32:"${DST}/16x16-${NAME}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_FOUND}" -compose src-over -composite -resize 16x16 png32:"${DST}/16x16-${NAME}${_OVERLAY_FOUND}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_OWNER}" -compose src-over -composite -resize 16x16 png32:"${DST}/16x16-${NAME}${_OVERLAY_S}${_OVERLAY_OWNER}.png"
+
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}${_OVERLAY_DNF}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}${_OVERLAY_FOUND}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}${_OVERLAY_OWNER}.png"
+
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}${_OVERLAY_DNF}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}${_OVERLAY_FOUND}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}${_OVERLAY_OWNER}.png"
+
+    convert -size 34x34 xc:none -alpha set -background none "${SRC}/${CACHE}" -geometry +1+1 -compose dst-over -composite "${OVERLAY_I}" -compose dst-over -composite png32:"${DST}/${NAME}${_OVERLAY_I}.png"
+    convert -size 34x34 xc:none -alpha set -background none "${SRC}/${CACHE}" -geometry +1+1 -compose dst-over -composite "${OVERLAY_I}" -compose dst-over -composite -fx '(r+g+b)/3' png32:"${DST}/${NAME}${_OVERLAY_I}-bw.png"
+
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}${_OVERLAY_DNF}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}${_OVERLAY_FOUND}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}${_OVERLAY_OWNER}.png"
+
+    convert -alpha set -background none "${SRC}/${CACHE}" png32:"${DST}/${NAME}${_OVERLAY_S}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_S}${_OVERLAY_DNF}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_S}${_OVERLAY_FOUND}.png"
+    convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_S}${_OVERLAY_OWNER}.png"
+}
+
+# Process all cache types
+for x in ${CACHE_TYPES}; do
+    if [ -f "${DST}/${x}.png" -a "${SKIP_EXISTING}" == "1" ]; then
+        echo "Skipping ${x} (already exists)"
+        continue
+    fi
+    echo -n "Creating iconset for ${x}..."
+    composeICONS "${x}"
+    echo "done."
+done
+
+
+if [ -f "${DST}/preview.png" ]; then
+    rm -f "${DST}/preview.png"
+fi
+echo "Creating preview ..."
+montage "${DST}/*.png" -geometry 32x32+2+2 -tile 16x png24:${DST}/preview.png
diff --git a/public/images/cache/res/make-kml-icons.sh b/public/images/cache/res/make-kml-icons.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Convert standard cache icons (in parent directory) for better display
+# in Google Earth via KML export
+
+SRC="."
+DST="../kml"
+PWD_CHECK="res"
+CACHE_TYPES=$(cat "__cache_types.txt" | grep -vE "^#|^\s*$" | cut -f2 -d' ')
+
+MARKER="__kml_oc.png"
+MARKER_DISABLED="__kml_disabled_oc.png"
+MARKER_ARCHIVED="__kml_archived_oc.png"
+
+if [ "$(basename $(pwd))" != "${PWD_CHECK}" ]; then
+    echo "Error: must be called inside '${PWD_CHECK}' directory. Stop."
+    echo
+    exit 1
+fi
+
+function _FILENAME() {
+    INPUT="$1"
+    OUTPUT=$(echo ${INPUT}.* | grep -iE "png|svg" | sort -r | head -n 1)
+    echo "${OUTPUT}"
+}
+
+function convertKML() {
+    NAME="$1"
+    CACHE=$(_FILENAME "_cache_type__$1")
+    KML="$1_kml.png"
+    KML_DISABLED="$1_kml-disabled.png"
+    KML_ARCHIVED="$1_kml-archived.png"
+
+    if [ ! -f "${CACHE}" ]; then
+        echo "Error: file not found ${CACHE}!"
+        exit 1
+    fi
+
+    rm -f "${DST}/${KML}"
+    rm -f "${DST}/${KML_DISABLED}"
+    rm -f "${DST}/${KML_ARCHIVED}"
+
+    composite -compose src-over -geometry +6+6 "${CACHE}" "${MARKER}" png32:"${DST}/${KML}"
+    composite -compose src-over -geometry +6+6 "${CACHE}" "${MARKER_DISABLED}" png32:"${DST}/${KML_DISABLED}"
+    composite -compose src-over -geometry +6+6 "${CACHE}" "${MARKER_ARCHIVED}" png32:"${DST}/${KML_ARCHIVED}"
+}
+
+for x in ${CACHE_TYPES}; do
+    echo -n "Creating KML icon for ${x}..."
+    convertKML $x
+    echo "done."
+done
diff --git a/public/images/cache/usb-a-dnf.png b/public/images/cache/usb-a-dnf.png
diff --git a/public/images/cache/usb-a-found.png b/public/images/cache/usb-a-found.png
diff --git a/public/images/cache/usb-a-owner.png b/public/images/cache/usb-a-owner.png
diff --git a/public/images/cache/usb-i-bw.png b/public/images/cache/usb-i-bw.png
diff --git a/public/images/cache/usb-n-dnf.png b/public/images/cache/usb-n-dnf.png
diff --git a/public/images/cache/usb-n-found.png b/public/images/cache/usb-n-found.png
diff --git a/public/images/cache/usb-n-owner.png b/public/images/cache/usb-n-owner.png
diff --git a/public/images/cache/usb-s-dnf.png b/public/images/cache/usb-s-dnf.png
diff --git a/public/images/cache/usb-s-found.png b/public/images/cache/usb-s-found.png
diff --git a/public/images/cache/usb-s-owner.png b/public/images/cache/usb-s-owner.png
diff --git a/public/images/cache/usb-s.png b/public/images/cache/usb-s.png
diff --git a/public/images/cache/usb.png b/public/images/cache/usb.png