huanld/pygeoapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use 3 dimensions

Browse Source
This commit is contained in:
KatKatKateryna
2024-08-22 13:05:40 +01:00
parent e1390ef685
commit a144de5874
4 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -2
View File
@@ -18,9 +18,8 @@ cd pygeoapi_venv
Scripts\activate
cd pygeoapi
// git clone https://github.com/specklesystems/pygeoapi
cd pygeoapi
git checkout dev
git reset --hard dev
// git reset --hard dev
// pip install --upgrade pip
// pip install -r requirements.txt
python setup.py install
pygeoapi/config.py
+14 -13
View File
@@ -76,19 +76,6 @@ def get_config(raw: bool = False, request: Request = None) -> dict:
if CONFIG == {}:
CONFIG = config_yaml
# if a key found, replace basemap URL to MapTiler
# make sure to restrict the usage for the key
if map_api_key_speckle and len(map_api_key_speckle)>=20:
CONFIG["server"]["map"]["url"] = r'https://api.maptiler.com/maps/dataviz/{z}/{x}/{y}.png' + f'?key={map_api_key_speckle}'
CONFIG["server"]["map"]["attribution"] = r'<a href="https://www.maptiler.com/copyright/" target="_blank">&copy; MapTiler</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>'
elif map_api_key_local and len(map_api_key_local)>=20:
CONFIG["server"]["map"]["url"] = r'https://api.maptiler.com/maps/dataviz/{z}/{x}/{y}.png' + f'?key={map_api_key_local}'
CONFIG["server"]["map"]["attribution"] = r'<a href="https://www.maptiler.com/copyright/" target="_blank">&copy; MapTiler</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>'
else:
CONFIG["server"]["map"]["url"] = r'https://tile.openstreetmap.org/{z}/{x}/{y}.png'
CONFIG["server"]["map"]["attribution"] = r'&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
url_valid = False
speckle_url = ""
if request is not None:
@@ -97,6 +84,20 @@ def get_config(raw: bool = False, request: Request = None) -> dict:
url_valid = True
speckle_url = url
# if a key found, replace basemap URL to MapTiler
# make sure to restrict the usage for the key
if ".speckle.systems" in request.url.split("?")[0] and map_api_key_speckle and len(map_api_key_speckle)>=20:
CONFIG["server"]["map"]["url"] = r'https://api.maptiler.com/maps/dataviz/{z}/{x}/{y}.png' + f'?key={map_api_key_speckle}'
CONFIG["server"]["map"]["attribution"] = r'<a href="https://www.maptiler.com/copyright/" target="_blank">&copy; MapTiler</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>'
elif map_api_key_local and len(map_api_key_local)>=20:
CONFIG["server"]["map"]["url"] = r'https://api.maptiler.com/maps/dataviz/{z}/{x}/{y}.png' + f'?key={map_api_key_local}'
CONFIG["server"]["map"]["attribution"] = r'<a href="https://www.maptiler.com/copyright/" target="_blank">&copy; MapTiler</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>'
else:
CONFIG["server"]["map"]["url"] = r'https://tile.openstreetmap.org/{z}/{x}/{y}.png'
CONFIG["server"]["map"]["attribution"] = r'&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
# once Speckle URL is found, set it as a provider
if url_valid:
# speckle_collection_pts["title"]["en"] = "Some Points"
pygeoapi/provider/speckle_utils/converter_utils.py
+11 -10
View File
@@ -17,7 +17,7 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
geometry["type"] = "MultiPoint"
coord_counts.append(None)
coords.append([f_base.x, f_base.y])
coords.append([f_base.x, f_base.y, f_base.z])
coord_counts.append([1])
elif isinstance(f_base, Mesh) or isinstance(f_base, Brep):
@@ -58,7 +58,8 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
for vertex_index in faces[count + 1 : count + 1 + pt_count]:
x = vertices[vertex_index * 3]
y = vertices[vertex_index * 3 + 1]
coords.append([x, y])
z = vertices[vertex_index * 3 + 2]
coords.append([x, y, z])
count += pt_count + 1
@@ -70,7 +71,7 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
coord_counts.append(None)
for geom in f_base.geometry:
coords.append([geom.x, geom.y])
coords.append([geom.x, geom.y, geom.z])
coord_counts.append([1])
elif isinstance(f_base.geometry[0], Polyline):
@@ -82,7 +83,7 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
local_poly_count = 0
for pt in geom.as_points():
coords.append([pt.x, pt.y])
coords.append([pt.x, pt.y, pt.z])
local_poly_count += 1
if len(coords)>2 and geom.closed is True and coords[0] != coords[-1]:
coords.append(coords[0])
@@ -98,7 +99,7 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
coord_counts.append([])
boundary_count = 0
for pt in polygon.boundary.as_points():
coords.append([pt.x, pt.y])
coords.append([pt.x, pt.y, pt.z])
boundary_count += 1
coord_counts[-1].append(boundary_count)
@@ -106,15 +107,15 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
for void in polygon.voids:
void_count = 0
for pt_void in void.as_points():
coords.append([pt_void.x, pt_void.y])
coords.append([pt_void.x, pt_void.y, pt_void.z])
void_count += 1
coord_counts[-1].append(void_count)
elif isinstance(f_base, Line):
geometry["type"] = "LineString"
start = [f_base.start.x, f_base.start.y]
end = [f_base.end.x, f_base.end.y]
start = [f_base.start.x, f_base.start.y, f_base.start.z]
end = [f_base.end.x, f_base.end.y, f_base.end.z]
coords.extend([start, end])
coord_counts.append([2])
@@ -122,7 +123,7 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
elif isinstance(f_base, Polyline):
geometry["type"] = "LineString"
for pt in f_base.as_points():
coords.append([pt.x, pt.y])
coords.append([pt.x, pt.y, pt.z])
if len(coords)>2 and f_base.closed is True and coords[0] != coords[-1]:
coords.append(coords[0])
@@ -131,7 +132,7 @@ def assign_geometry(feature: Dict, f_base) -> ( List[List[List[float]]], List[Li
elif isinstance(f_base, Curve):
geometry["type"] = "LineString"
for pt in f_base.displayValue.as_points():
coords.append([pt.x, pt.y])
coords.append([pt.x, pt.y, pt.z])
if len(coords)>2 and f_base.displayValue.closed is True and coords[0] != coords[-1]:
coords.append(coords[0])
pygeoapi/provider/speckle_utils/coords_utils.py
+3 -1
View File
@@ -76,7 +76,8 @@ def reproject_2d_coords_list(self, coords_in: List[List[float]]) -> List[List[fl
CRS.from_user_input(4326),
always_xy=True,
)
return [[pt[0], pt[1]] for pt in transformer.itransform(coords_offset)]
transformed = [[pt[0], pt[1], pt[2]] for pt in transformer.itransform(coords_offset)]
return transformed
def offset_rotate(self, coords_in: List[list]) -> List[List[float]]:
"""Apply offset and rotation to coordinates, according to SpeckleProvider CRS_dict."""
@@ -96,6 +97,7 @@ def offset_rotate(self, coords_in: List[list]) -> List[List[float]]:
[
scale_factor * (x2 + self.crs_dict["offset_x"]),
scale_factor * (y2 + self.crs_dict["offset_y"]),
scale_factor * (coord[2]),
]
)