Commit 6aee00ab authored by Rick Gruber-Riemer's avatar Rick Gruber-Riemer

Prparing buildings_lib.Building and buildings.py for reusing in owbb.landuse.py

parent 6d46c657
......@@ -106,7 +106,8 @@ class Building(object):
self.inner_rings_list = None
self.outer_nodes_closest = None
self.anchor = None
self.polygon = None
self.polygon = None # can have inner and outer rings, i.e. the real polygon
self.geometry = None # only the outer ring - for convenience and faster processing in some analysis
self.update_geometry(outer_ring, inner_rings_list, refs)
# set in buildings.py for building relations prior to building_lib.analyse(...)
......@@ -195,6 +196,7 @@ class Building(object):
def _set_polygon(self, outer: shg.LinearRing, inner: List[shg.LinearRing]=list()) -> None:
self.polygon = shg.Polygon(outer, inner)
self.geometry = shg.Polygon(outer)
def _set_pts_all(self, cluster_offset: Vec2d) -> None:
"""Given an cluster middle point changes all coordinates in x/y space."""
......@@ -238,7 +240,8 @@ class Building(object):
@property
def area(self):
return self.polygon.area
"""The area of the building only taking into account the outer ring, not inside holes."""
return self.geometry.area
@property
def circumference(self):
......@@ -501,7 +504,7 @@ class Building(object):
# OSM key min_value is used to raise ("hover") a facade above ground
# -- no complex roof on tiny buildings.
if "min_height" in self.tags:
if "min_height" in self.tags: # FIXME: is it min_height or min:height?
self.min_height = utils.osmparser.parse_length(self.tags['min_height'])
# Now that we have all what OSM provides, use some heuristics, if we are missing height/levels
......@@ -1263,7 +1266,7 @@ def overlap_check_blocked_areas(orig_buildings: List[Building], blocked_areas: L
for building in orig_buildings:
is_intersected = False
for blocked_area in blocked_areas:
if building.polygon.intersects(blocked_area):
if building.geometry.intersects(blocked_area):
logging.debug("Building osm_id=%d intersects with blocked area.", building.osm_id)
is_intersected = True
break
......@@ -1272,8 +1275,8 @@ def overlap_check_blocked_areas(orig_buildings: List[Building], blocked_areas: L
return buildings_after_remove_with_parent_children(orig_buildings, buildings_to_remove)
def overlap_check_convex_hull(orig_buildings: List[Building], stg_entries: List[utils.stg_io2.STGEntry],
stats: utilities.Stats) -> List[Building]:
def overlap_check_convex_hull(orig_buildings: List[Building], stg_entries: List[utils.stg_io2.STGEntry])\
-> List[Building]:
"""Checks for all buildings whether their polygon intersects with a static or shared object's convex hull."""
buildings_to_remove = list()
......@@ -1281,9 +1284,8 @@ def overlap_check_convex_hull(orig_buildings: List[Building], stg_entries: List[
is_intersecting = False
for entry in stg_entries:
try:
if entry.convex_hull is not None and entry.convex_hull.intersects(building.polygon):
if entry.convex_hull is not None and entry.convex_hull.intersects(building.geometry):
is_intersecting = True
stats.skipped_nearby += 1
if building.name is None or len(building.name) == 0:
logging.debug("Convex hull of object '%s' is intersecting. Skipping building with osm_id %d",
entry.obj_filename, building.osm_id)
......
This diff is collapsed.
......@@ -145,6 +145,30 @@ LOD_PERCENTAGE_DETAIL Decimal 0.5 Of the rema
============================================= ======== ======= ==============================================================================
--------------------------
Building Levels and Height
--------------------------
In OSM the height of a building can be described using the following keys:
* ``building:height``
* ``roof:height``
* ``height`` (the total of building_height and roof_height, but most often used alone)
* ``building:levels``
* ``roof:levels`` (not used in osm2city)
* ``levels``
Most often none of these features are tagged and then the number of levels are determined based on the settlement type and the corresponding ``BUILDING_NUMBER_LEVELS_* `` parameter. The height is always calculated as the product of the number of levels times parameter ``BUILDING_LEVEL_HEIGHT_*``. If only the height is given, then the levels are calculated by simple rounding — and this level value is then used for calculating the height. The reason for this is that some uniformity in building heights/values is normally observed in the real world — and because textures have a defined height per level.
An exception to this is made for building parts in a relationship (`Simple 3D buildings`_), as the heights in this case might be necessary to be correct (e.g. a dome on a church).
The distribution is using Python random triangular_, where low <= N <= high and the specified mode between those bounds.
.. _triangular: https://docs.python.org/3.5/library/random.html#random.triangular
.. _Simple 3D buildings: http://wiki.openstreetmap.org/wiki/Simple_3D_buildings
.. _chapter-parameters-buildings-european-label:
------------------------------------------
......
......@@ -157,8 +157,8 @@ BUILDING_NUMBER_LEVELS_BLOCK = [4.5, 5.0, 5.1]
BUILDING_NUMBER_LEVELS_DENSE = [3.0, 3.6, 4.0]
BUILDING_NUMBER_LEVELS_PERIPHERY = [1.0, 1.9, 3.0]
BUILDING_NUMBER_LEVELS_RURAL = [1.0, 1.5, 3.0]
BUILDING_LEVEL_HEIGHT_URBAN = 3.5
BUILDING_LEVEL_HEIGHT_RURAL = 2.5
BUILDING_LEVEL_HEIGHT_URBAN = 3.5 # this value should not be changed unless special textures are used
BUILDING_LEVEL_HEIGHT_RURAL = 2.5 # ditto
BUILDING_USE_SHARED_WORSHIP = False # try to use shared models for worship buildings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment