tkintermapview 1.28__tar.gz → 1.30__tar.gz

{tkintermapview-1.28 → tkintermapview-1.30}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: tkintermapview
-Version: 1.28
+Version: 1.30
 Summary: A python Tkinter widget to display image tile maps like OpenStreetMap or Satellite Images.
 Home-page: https://github.com/TomSchimansky/TkinterMapView
 Author: Tom Schimansky
@@ -11,5 +11,23 @@ Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: geopy
+Requires-Dist: certifi
+Requires-Dist: geocoder
+Requires-Dist: pillow
+Requires-Dist: requests
+Requires-Dist: pyperclip
+Requires-Dist: pywin32; platform_system == "Windows"
+Requires-Dist: customtkinter
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 **Detailed Information: https://github.com/TomSchimansky/TkinterMapView**

{tkintermapview-1.28 → tkintermapview-1.30}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup
 # 5. python3.10 -m twine upload dist/*
 
 setup(name="tkintermapview",
-      version="1.28",
+      version="1.30",
       author="Tom Schimansky",
       license="Creative Commons Zero v1.0 Universal",
       url="https://github.com/TomSchimansky/TkinterMapView",
@@ -20,5 +20,5 @@ setup(name="tkintermapview",
       classifiers=["Operating System :: OS Independent",
                    "Programming Language :: Python :: 3",
                    "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication"],
-      install_requires=["geocoder", "pillow", "requests", "pyperclip", 'pywin32; platform_system=="Windows"', "customtkinter"],
+      install_requires=["geopy", "certifi", "geocoder", "pillow", "requests", "pyperclip", 'pywin32; platform_system=="Windows"', "customtkinter"],
       python_requires=">=3.6")

{tkintermapview-1.28 → tkintermapview-1.30}/tkintermapview/__init__.py

@@ -1,7 +1,6 @@
-__version__ = "1.28"
+__version__ = "1.30"
 
 from .map_widget import TkinterMapView
 from .offline_loading import OfflineLoader
 from .utility_functions import convert_coordinates_to_address, convert_coordinates_to_country, convert_coordinates_to_city
-from .utility_functions import convert_address_to_coordinates
 from .utility_functions import decimal_to_osm, osm_to_decimal

{tkintermapview-1.28 → tkintermapview-1.30}/tkintermapview/map_widget.py

@@ -10,7 +10,10 @@ import sys
 import io
 import sqlite3
 import pyperclip
-import geocoder
+import ssl
+import certifi
+from geopy.geocoders import Nominatim
+from geopy.exc import GeocoderTimedOut, GeocoderUnavailable
 from PIL import Image, ImageTk
 from typing import Callable, List, Dict, Union, Tuple
 from functools import partial
@@ -309,7 +312,7 @@ class TkinterMapView(tkinter.Frame):
         """ set new middle position of map in decimal coordinates """
 
         # convert given decimal coordinates to OSM coordinates and set corner positions accordingly
-        current_tile_position = decimal_to_osm(deg_x, deg_y, self.zoom)
+        current_tile_position = decimal_to_osm(deg_x, deg_y, round(self.zoom))
         self.upper_left_tile_pos = (current_tile_position[0] - ((self.width / 2) / self.tile_size),
                                     current_tile_position[1] - ((self.height / 2) / self.tile_size))
 
@@ -323,6 +326,7 @@ class TkinterMapView(tkinter.Frame):
 
         self.check_map_border_crossing()
         self.draw_initial_array()
+        # self.draw_move() enough?
 
         return marker_object
 
@@ -330,17 +334,32 @@ class TkinterMapView(tkinter.Frame):
         """ Function uses geocode service of OpenStreetMap (Nominatim).
             https://geocoder.readthedocs.io/providers/OpenStreetMap.html """
 
-        result = geocoder.osm(address_string)
+        ssl_ctx = ssl.create_default_context(cafile=certifi.where())
+        geolocator = Nominatim(user_agent="TkinterMapView/1.0 (contact@customtkinter.tomschimansky.com)", ssl_context=ssl_ctx)
 
-        if result.ok:
+        try:
+            location = geolocator.geocode(address_string)
+        except (GeocoderTimedOut, GeocoderUnavailable) as e:
+            print(f"Geocoding error: {e}")
+            return False
+
+        if location:
+
+            # 2. Extract bounding box from the raw Nominatim response
+            # Nominatim format: ['lat_min', 'lat_max', 'lon_min', 'lon_max']
+            raw_bbox = location.raw.get("boundingbox")
 
-            # determine zoom level for result by bounding box
-            if hasattr(result, "bbox"):
+            if raw_bbox:
                 zoom_not_possible = True
 
+                # Convert string coordinates to floats and map them to SW / NE
+                lat_min, lat_max, lon_min, lon_max = map(float, raw_bbox)
+                southwest = (lat_min, lon_min)
+                northeast = (lat_max, lon_max)
+
                 for zoom in range(self.min_zoom, self.max_zoom + 1):
-                    lower_left_corner = decimal_to_osm(*result.bbox['southwest'], zoom)
-                    upper_right_corner = decimal_to_osm(*result.bbox['northeast'], zoom)
+                    lower_left_corner = decimal_to_osm(*southwest, zoom)
+                    upper_right_corner = decimal_to_osm(*northeast, zoom)
                     tile_width = upper_right_corner[0] - lower_left_corner[0]
 
                     if tile_width > math.floor(self.width / self.tile_size):
@@ -353,13 +372,14 @@ class TkinterMapView(tkinter.Frame):
             else:
                 self.set_zoom(10)
 
+            # 3. Retrieve the formatted address text
             if text is None:
-                try:
-                    text = result.geojson['features'][0]['properties']['address']
-                except:
-                    text = address_string
+                # geopy provides a beautifully formatted address out of the box
+                text = location.address if location.address else address_string
+
+            # 4. Set the position using the extracted coordinates
+            return self.set_position(location.latitude, location.longitude, marker=marker, text=text, **kwargs)
 
-            return self.set_position(*result.latlng, marker=marker, text=text, **kwargs)
         else:
             return False
 

{tkintermapview-1.28 → tkintermapview-1.30}/tkintermapview/utility_functions.py

@@ -40,14 +40,3 @@ def convert_coordinates_to_city(deg_x: float, deg_y: float) -> str:
 def convert_coordinates_to_country(deg_x: float, deg_y: float) -> str:
     """ returns country name """
     return geocoder.osm([deg_x, deg_y], method="reverse").country
-
-
-def convert_address_to_coordinates(address_string: str) -> tuple:
-    """ returns address object for given coords or None if no address found """
-
-    result = geocoder.osm(address_string)
-
-    if result.ok:
-        return tuple(result.latlng)
-    else:
-        return None

{tkintermapview-1.28 → tkintermapview-1.30}/tkintermapview.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: tkintermapview
-Version: 1.28
+Version: 1.30
 Summary: A python Tkinter widget to display image tile maps like OpenStreetMap or Satellite Images.
 Home-page: https://github.com/TomSchimansky/TkinterMapView
 Author: Tom Schimansky
@@ -11,5 +11,23 @@ Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: geopy
+Requires-Dist: certifi
+Requires-Dist: geocoder
+Requires-Dist: pillow
+Requires-Dist: requests
+Requires-Dist: pyperclip
+Requires-Dist: pywin32; platform_system == "Windows"
+Requires-Dist: customtkinter
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 **Detailed Information: https://github.com/TomSchimansky/TkinterMapView**

{tkintermapview-1.28 → tkintermapview-1.30}/tkintermapview.egg-info/requires.txt

@@ -1,3 +1,5 @@
+geopy
+certifi
 geocoder
 pillow
 requests