voxcity 0.5.19__tar.gz → 0.5.21__tar.gz

{voxcity-0.5.19 → voxcity-0.5.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.19
+Version: 0.5.21
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 Author-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>
 Maintainer-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>

{voxcity-0.5.19 → voxcity-0.5.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "voxcity"
-version = "0.5.19"
+version = "0.5.21"
 requires-python = ">=3.10,<3.13"
 classifiers = [
     "Programming Language :: Python :: 3.10",

{voxcity-0.5.19 → voxcity-0.5.21}/src/voxcity/exporter/__init__.py

@@ -1,4 +1,3 @@
-from .geojson import *
 from .envimet import *
 from .magicavoxel import *
 from .obj import *

{voxcity-0.5.19 → voxcity-0.5.21}/src/voxcity/exporter/envimet.py

@@ -334,8 +334,23 @@ def create_xml_content(building_height_grid, building_id_grid, land_cover_veg_gr
         "$locationTimeZone_Longitude$": timezone_info[1],
     }
 
+    # Ensure no None values are passed to replace()
     for placeholder, value in placeholders.items():
-        xml_template = xml_template.replace(placeholder, value)
+        if value is None:
+            print(f"Warning: {placeholder} is None, using fallback value")
+            if placeholder == "$locationName$":
+                value = "Unknown Location/ Unknown Country"
+            elif placeholder == "$locationTimeZone_Name$":
+                value = "UTC+00:00"
+            elif placeholder == "$locationTimeZone_Longitude$":
+                value = "0.00000"
+            elif placeholder == "$modelDescription$":
+                value = "[Enter model description]"
+            elif placeholder == "$modelAuthor$":
+                value = "[Enter model author name]"
+            else:
+                value = "Unknown"
+        xml_template = xml_template.replace(placeholder, str(value))
     
     # Calculate building heights including terrain elevation
     building_on_dem_grid = building_height_grid + dem_grid    

{voxcity-0.5.19 → voxcity-0.5.21}/src/voxcity/geoprocessor/utils.py

@@ -508,7 +508,7 @@ def get_city_country_name_from_rectangle(coordinates):
         coordinates (list): List of (longitude, latitude) coordinates defining the rectangle
         
     Returns:
-        str: String in format "city/ country" or None if lookup fails
+        str: String in format "city/ country" or fallback value if lookup fails
         
     Example:
         >>> coords = [(139.65, 35.67), (139.66, 35.67),
@@ -524,7 +524,7 @@ def get_city_country_name_from_rectangle(coordinates):
     center_coord = (center_lat, center_lon)
 
     # Initialize geocoder with rate limiting to avoid hitting API limits
-    geolocator = Nominatim(user_agent="your_app_name (your_email@example.com)")
+    geolocator = Nominatim(user_agent="VoxCity/1.0 (voxcity@example.com)")
     reverse = RateLimiter(geolocator.reverse, min_delay_seconds=2, error_wait_seconds=5, max_retries=3)
 
     try:
@@ -537,9 +537,12 @@ def get_city_country_name_from_rectangle(coordinates):
             country = address.get('country', '')
             return f"{city}/ {country}"
         else:
-            print("Location not found")
+            print("Location not found, using fallback value")
+            return "Unknown Location/ Unknown Country"
     except Exception as e:
         print(f"Error retrieving location for {center_coord}: {e}")
+        print("Using fallback value")
+        return "Unknown Location/ Unknown Country"
 
 def get_timezone_info(rectangle_coords):
     """
@@ -558,9 +561,6 @@ def get_timezone_info(rectangle_coords):
     Returns:
         tuple: (timezone string with UTC offset, central meridian longitude string)
         
-    Raises:
-        ValueError: If timezone cannot be determined for the given location
-        
     Example:
         >>> coords = [(139.65, 35.67), (139.66, 35.67),
         ...           (139.66, 35.68), (139.65, 35.68)]
@@ -573,25 +573,39 @@ def get_timezone_info(rectangle_coords):
     center_lon = sum(longitudes) / len(longitudes)
     center_lat = sum(latitudes) / len(latitudes)
     
-    # Find timezone at center coordinates
-    tf = TimezoneFinder()
-    timezone_str = tf.timezone_at(lng=center_lon, lat=center_lat)
-    
-    if timezone_str:
-        # Get current time in local timezone to calculate offset
-        timezone = pytz.timezone(timezone_str)
-        now = datetime.now(timezone)
-        offset_seconds = now.utcoffset().total_seconds()
-        offset_hours = offset_seconds / 3600
-
-        # Format timezone offset and calculate central meridian
-        utc_offset = f"UTC{offset_hours:+.2f}"
-        timezone_longitude = offset_hours * 15  # Each hour offset = 15 degrees longitude
-        timezone_longitude_str = f"{timezone_longitude:.5f}"
-
+    try:
+        # Find timezone at center coordinates
+        tf = TimezoneFinder()
+        timezone_str = tf.timezone_at(lng=center_lon, lat=center_lat)
+        
+        if timezone_str:
+            # Get current time in local timezone to calculate offset
+            timezone = pytz.timezone(timezone_str)
+            now = datetime.now(timezone)
+            offset_seconds = now.utcoffset().total_seconds()
+            offset_hours = offset_seconds / 3600
+
+            # Format timezone offset and calculate central meridian
+            utc_offset = f"UTC{offset_hours:+.2f}"
+            timezone_longitude = offset_hours * 15  # Each hour offset = 15 degrees longitude
+            timezone_longitude_str = f"{timezone_longitude:.5f}"
+
+            return utc_offset, timezone_longitude_str
+        else:
+            # Fallback: estimate timezone from longitude
+            print("Timezone not found, estimating from longitude")
+            estimated_offset = center_lon / 15  # Rough estimation: 15 degrees per hour
+            utc_offset = f"UTC{estimated_offset:+.2f}"
+            timezone_longitude_str = f"{center_lon:.5f}"
+            return utc_offset, timezone_longitude_str
+    except Exception as e:
+        print(f"Error retrieving timezone for {center_lon}, {center_lat}: {e}")
+        print("Using fallback timezone values")
+        # Fallback values
+        estimated_offset = center_lon / 15
+        utc_offset = f"UTC{estimated_offset:+.2f}"
+        timezone_longitude_str = f"{center_lon:.5f}"
         return utc_offset, timezone_longitude_str
-    else:
-        raise ValueError("Time zone not found for the given location.")
 
 def validate_polygon_coordinates(geometry):
     """

{voxcity-0.5.19 → voxcity-0.5.21}/src/voxcity/utils/__init__.py

@@ -1,4 +1,3 @@
-from .visualization import *
 from .lc import *
 from .weather import *
 from .material import *

{voxcity-0.5.19 → voxcity-0.5.21}/src/voxcity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.5.19
+Version: 0.5.21
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 Author-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>
 Maintainer-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>