From c1edef31878b74ed104f6918f3b3f36d799a6690 Mon Sep 17 00:00:00 2001
From: AD <alexander.dunkel@tu-dresden.de>
Date: Tue, 10 Apr 2018 15:39:36 +0200
Subject: [PATCH] Added Function/Files to manually override place lat/lng or
 filter out specific places

---
 00_Config/CorrectPlaceLatLng.txt |  4 ++++
 00_Config/SortOutAlways.txt      |  4 +++-
 00_Config/SortOutPlaces.txt      |  4 ++++
 generateTagClusters.py           | 40 +++++++++++++++++++++++++++++---
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 00_Config/CorrectPlaceLatLng.txt
 create mode 100644 00_Config/SortOutPlaces.txt

diff --git a/00_Config/CorrectPlaceLatLng.txt b/00_Config/CorrectPlaceLatLng.txt
new file mode 100644
index 0000000..8efbff4
--- /dev/null
+++ b/00_Config/CorrectPlaceLatLng.txt
@@ -0,0 +1,4 @@
+placeID,lat,lng
+337559935,47.5437243,12.9401653
+1346790455415070,47.5096939,12.9915378
+867012618,47.5438401,12.9721486
\ No newline at end of file
diff --git a/00_Config/SortOutAlways.txt b/00_Config/SortOutAlways.txt
index b8d830e..fe3bded 100644
--- a/00_Config/SortOutAlways.txt
+++ b/00_Config/SortOutAlways.txt
@@ -316,4 +316,6 @@ sutro
 valencia
 brannan
 instadaily
-ich
\ No newline at end of file
+ich
+instatravel
+travelphotography
\ No newline at end of file
diff --git a/00_Config/SortOutPlaces.txt b/00_Config/SortOutPlaces.txt
new file mode 100644
index 0000000..df0b5a0
--- /dev/null
+++ b/00_Config/SortOutPlaces.txt
@@ -0,0 +1,4 @@
+placeID, name
+254973648, Nationalpark Berchtesgaden
+1462084363867006,nationalpark-berchtesgaden
+627972463994167,nationalpark-berchtesgaden
\ No newline at end of file
diff --git a/generateTagClusters.py b/generateTagClusters.py
index deb78d2..7f0736f 100644
--- a/generateTagClusters.py
+++ b/generateTagClusters.py
@@ -123,7 +123,32 @@ def print_store_log(text,end=None):
     with open(SortOutAlways_inStr_file, newline='', encoding='utf8') as f: #read each unsorted file and sort lines based on datetime (as string)
         SortOutAlways_inStr_set = set([line.lower().rstrip('\r\n') for line in f])
     print(f'Loaded {len(SortOutAlways_inStr_set)} inStr stoplist items.')
-
+#manually filter places or correct lat/lng
+SortOutPlaces_file = "00_Config/SortOutPlaces.txt"
+CorrectPlaceLatLng_file = "00_Config/CorrectPlaceLatLng.txt"
+SortOutPlaces_set = set()
+CorrectPlaceLatLng_dict = dict()
+SortOutPlaces = False
+if os.path.isfile(SortOutPlaces_file):
+    with open(SortOutPlaces_file, newline='', encoding='utf8') as f:
+        f.readline()
+        #placeid
+        SortOutPlaces_set = set([line.rstrip('\r\n').split(",")[0] for line in f if len(line) > 0])
+    SortOutPlaces = True
+    print(f'Loaded {len(SortOutPlaces_set)} stoplist places.')
+CorrectPlaces = False
+if os.path.isfile(CorrectPlaceLatLng_file):
+    with open(CorrectPlaceLatLng_file, newline='', encoding='utf8') as f:
+        f.readline()
+        for line in f:
+            if len(line) > 0:
+                linesplit = line.rstrip('\r\n').split(",")
+                if len(linesplit) > 1:
+                    #placeid = #lat,lng
+                    CorrectPlaceLatLng_dict[linesplit[0]] = (linesplit[1],linesplit[2])
+    CorrectPlaces = True
+    print(f'Loaded {len(CorrectPlaceLatLng_dict)} place lat/lng corrections.')
+    
 writeGISCompLine = True # writes placeholder entry after headerline for avoiding GIS import format issues
 
 #Choose one of four options for Input data type:
@@ -638,12 +663,21 @@ def is_number(s):
                     photo_comments = None#item[14]
                     photo_mediatype = None#item[19]
                     photo_locName = item[4] #guid
+                    if SortOutPlaces:
+                        if not item[19] == "":
+                            if item[19] in SortOutPlaces_set:
+                                skippedCount += 1
+                                continue
                     if item[2] == "" or item[3] == "":
                         count_non_geotagged += 1
                         continue #skip non-geotagged medias
                     else:
-                        photo_latitude = Decimal(item[2]) #guid
-                        photo_longitude = Decimal(item[3]) #guid
+                        if CorrectPlaces and not item[19] and item[19] in CorrectPlaceLatLng_dict:
+                            photo_latitude = Decimal(CorrectPlaceLatLng_dict[item[19]][0]) #correct lat/lng
+                            photo_longitude = Decimal(CorrectPlaceLatLng_dict[item[19]][1]) #correct lat/lng
+                        else:
+                            photo_latitude = Decimal(item[2]) #guid
+                            photo_longitude = Decimal(item[3]) #guid
                         setLatLngBounds(photo_latitude,photo_longitude)
                     photo_locID = str(photo_latitude) + ':' + str(photo_longitude) #create loc_id from lat/lng    
                     #assign lat/lng coordinates from dict