request url

Exceptions and forwarding

.gitignore

@@ -1,5 +1,5 @@
 access_log
-error_log
+error_log*
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

README.md

@@ -81,7 +81,7 @@ Then you can add it to the base map (e.g. using Leaflet and OpenStreetMap basema
         loadSpeckleData();
 
         async function loadSpeckleData() => {
-            var speckle_model_url = 'https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=polygons';
+            var speckle_model_url = 'https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=polygons';
             const speckle_data = await fetch(speckle_model_url, {
                 headers: {'Accept': 'application/geo+json'}
             }).then(response => response.json());

pygeoapi/api/__init__.py

@@ -75,7 +75,7 @@ LOGGER = logging.getLogger(__name__)
 #: Return headers for requests (e.g:X-Powered-By)
 HEADERS = {
     'Content-Type': 'application/json',
-    'X-Powered-By': f'pygeoapi {__version__}'
+    # 'X-Powered-By': f'pygeoapi {__version__}'
 }
 
 CHARSET = ['utf-8']

pygeoapi/api/itemtypes.py

@@ -574,61 +574,6 @@ def get_collection_items(
     if isinstance(url_saved_as_data, str):
         url_props = url_saved_as_data.lower().split("&")
     
-    content['missing_url'] = content['missing_url_href'] = ""
-    content['requested_data_type'] = "polygons (default)"
-    content['preserve_attributes'] = "false (default)"
-    content['speckle_url'] = content['speckle_project_url'] = content['crs_authid'] = content['lat'] = content['lon'] = content['north_degrees'] = content['limit'] = "-"
-    crsauthid = False
-    for item in url_props:
-        # if CRS authid is found, rest will be ignored
-        if "speckleurl=" in item:
-            content['speckle_url'] = item.split("speckleurl=")[1]
-            if content['speckle_url'][-1] == "/":
-                content['speckle_url'] = content['speckle_url'][:-1]
-            content['speckle_project_url'] = content['speckle_url'].split("/models")[0]
-        elif "datatype=" in item:
-            content['requested_data_type'] = item.split("datatype=")[1]
-            if content['requested_data_type'] not in ["points", "lines", "polygons", "projectcomments"]:
-                content['requested_data_type'] = "polygons (default)"
-        elif "preserveattributes=" in item:
-            content['preserve_attributes'] = item.split("preserveattributes=")[1]
-            if content['preserve_attributes'] not in ["true", "false"]:
-                content['preserve_attributes'] = "false (default)"
-        elif "crsauthid=" in item:
-            content['crs_authid'] = item.split("crsauthid=")[1]
-            crsauthid = True
-        elif "lat=" in item:
-            try:
-                content['lat'] = float(item.split("lat=")[1])
-            except:
-                content['lat'] = f"Invalid input, must be numeric: {item.split('lat=')[1]}"
-        elif "lon=" in item:
-            try:
-                content['lon'] = float(item.split("lon=")[1])
-            except:
-                content['lon'] = f"Invalid input, must be numeric: {item.split('lon=')[1]}"
-        elif "northdegrees=" in item:
-            try:
-                content['north_degrees'] = float(item.split("northdegrees=")[1])
-            except:
-                content['north_degrees'] = f"Invalid input, must be numeric: {item.split('northdegrees=')[1]}"
-        elif "limit=" in item:
-            try:
-                content['limit'] = float(item.split("limit=")[1])
-            except:
-                content['limit'] = f"Invalid input, must be integer: {item.split('limit=')[1]}"
-    
-    if content['speckle_url'] == "-":
-        content['missing_url'] = "true"
-
-    if crsauthid:
-        content['lat'] += " (not applied)"
-        content['lon'] += " (not applied)"
-        content['north_degrees'] += " (not applied)"
-    
-    if content['limit'] == "-":
-        content['limit'] = f"{api.config['server']['limit']} (default)"
-
     # Set response language to requested provider locale
     # (if it supports language) and/or otherwise the requested pygeoapi
     # locale (or fallback default locale)

pygeoapi/flask_app.py

@@ -168,6 +168,21 @@ def execute_from_flask(api_function, request: Request, *args,
     return get_response((headers, status, content))
 
 
+def generate():
+    collection_id = "speckle"
+
+    yield loading_screen().data
+    
+    try:
+        browser_response = execute_from_flask(itemtypes_api.get_collection_items,
+                            request, collection_id,
+                            skip_valid_check=True)
+        yield browser_response.data
+
+    except Exception as ex:
+        yield error_screen(ex).data
+
+
 @BLUEPRINT.route('/')
 def landing_page():
     """
@@ -176,8 +191,6 @@ def landing_page():
     :returns: HTTP response
     """
     
-    collection_id = "speckle"
-
     agent = request.headers.get('User-Agent')
     # Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36
     # Mozilla/5.0 QGIS/32815/Windows 10 Version 2009
@@ -187,7 +200,11 @@ def landing_page():
     browser_list = ["Chrome", "Safari", "Firefox", "Edg/", "Trident/"]
     print(agent)
     
-    if "YaBrowser/" in agent:
+    request.url += f"&userAgent={agent}"
+    CONFIG = get_config(request=request)
+    api_ = API(CONFIG, OPENAPI)
+    
+    if agent is not None and ("YaBrowser/" in agent or "yandex" in agent.lower()):
         raise ValueError("Your browser is not supported.")
     for br in browser_list:
         if br in agent:
@@ -196,18 +213,6 @@ def landing_page():
     
     # if requested from the browser, return this, otherwise ignore IF statement
     if request.method == 'GET' and browser_agent:  # list items
-        
-        def generate():
-            yield loading_screen().data
-            try:
-                browser_response = execute_from_flask(itemtypes_api.get_collection_items,
-                                    request, collection_id,
-                                    skip_valid_check=True)
-                yield browser_response.data
-
-            except Exception as ex:
-                yield error_screen(ex).data
-
         return Response(stream_with_context(generate()))
     
     return get_response(api_.landing_page(request))
@@ -294,10 +299,17 @@ def collections(collection_id=None):
     :returns: HTTP response
     """
     
-    # raise NotImplementedError()
     return get_response(api_.describe_collections(request, collection_id))
 
 
+@BLUEPRINT.route('/speckle')
+def speckle_collection():
+    
+    collection_id="speckle"
+
+    return collection_items(collection_id=collection_id)
+
+
 @BLUEPRINT.route('/collections/<path:collection_id>/schema')
 def collection_schema(collection_id):
     """

pygeoapi/provider/speckle.py

@@ -119,21 +119,29 @@ class SpeckleProvider(BaseProvider):
         self.speckle_url = self.url.lower().split("speckleurl=")[-1].split("&")[0].split("@")[0].split("?")[0]
 
         self.speckle_data = None
+        self.project_name = ""
         self.model_name = ""
 
         self.crs = None
         self.crs_dict = None
 
-        self.requested_data_type: str = "polygons (default)" # points, lines, polygons, projectcomments
-        self.preserve_attributes: str = "false (default)"
+        self.commit_gis = False
+        self.url_params = {"url_data_type":"", "url_preserve_attributes":"", "url_crs_authid":"", "url_lat":"","url_lon":"","url_north_degrees":"","url_limit":""}
+        self.times = {}
 
+        self.requested_data_type: str = "polygons (default)" # points, lines, polygons, projectcomments
+        self.preserve_attributes: str = "true (default)"
         self.lat: float = 48.76755913928929 #51.52486388756923
         self.lon: float = 11.408741923664028 #0.1621445437168942
         self.north_degrees: float = 0
-        self.extent = [-180,-90,180,90]
+        self.crs_authid = ""
         self.limit = 10000
+        self.user_agent = ""
+
+        self.missing_url = ""
         self.limit_message = ""
 
+        self.extent = [-180,-90,180,90]
         self.material_color_proxies = {}
 
 
@@ -173,7 +181,7 @@ class SpeckleProvider(BaseProvider):
         if self.data == "":
             return 
 
-        get_set_url_parameters(self)
+        get_set_url_parameters(self) # possible ValueError
 
         # check if it's a new request (self.data was updated and doesn't match self.url)
         new_request = False
@@ -266,6 +274,18 @@ class SpeckleProvider(BaseProvider):
         if data is None:
             return {"features":[], "comments":[], "extent": [-180,-90,180,90]}
 
+        # add URL parameters
+        data['speckle_url'] = self.speckle_url
+        data['requested_data_type'] = self.requested_data_type
+        data['preserve_attributes'] = self.preserve_attributes
+        data['crs_authid'] = self.crs_authid
+        data['lat'] = self.lat
+        data['lon'] = self.lon
+        data['north_degrees'] = self.north_degrees
+        data['limit'] = self.limit
+        data['missing_url'] = self.missing_url
+
+
         data["numberMatched"] = len(data["features"])
 
         if resulttype == "hits":
@@ -324,7 +344,8 @@ class SpeckleProvider(BaseProvider):
     def load_speckle_data(self: str) -> Dict:
         """Receive and process Speckle data, return geojson."""
 
-        from pygeoapi.provider.speckle_utils.server_utils import get_stream_branch, get_client, get_comments
+        from datetime import datetime, timezone
+        from pygeoapi.provider.speckle_utils.server_utils import get_stream_branch, get_client, get_comments, set_actions
 
         from specklepy.objects.base import Base
         from specklepy.logging.exceptions import SpeckleException
@@ -354,6 +375,7 @@ class SpeckleProvider(BaseProvider):
             comments = {}
 
         # set the Model name
+        self.project_name = stream['name']
         self.model_name = branch['name']
 
         commit = branch["commits"]["items"][0]
@@ -364,6 +386,7 @@ class SpeckleProvider(BaseProvider):
             raise SpeckleException("Transport not found")
 
         # receive commit
+        set_actions(self, client)
         try:
             commit_obj = operations.receive(objId, transport, None)
         except Exception as ex:
@@ -377,10 +400,9 @@ class SpeckleProvider(BaseProvider):
             message="Received commit in pygeoapi",
         )
 
-        print(f"Rendering model '{branch['name']}' of the project '{stream['name']}'")
+        print(f"____{datetime.now().astimezone(timezone.utc)} _Rendering model '{branch['name']}' of the project '{stream['name']}'")
         speckle_data = self.traverse_data(commit_obj, comments)
 
-
         speckle_data["features"].extend(speckle_data["comments"])
         speckle_data["comments"] = []
 
@@ -459,7 +481,10 @@ class SpeckleProvider(BaseProvider):
             sorted_list[i]["properties"]["FID"] = i+1 
         data['features'] = sorted_list
         time2 = datetime.now()
-        print(f"Sorting time: {(time2-time1).total_seconds()}")
+        
+        time_operation = (time2-time1).total_seconds()
+        self.times["time_sort"] = time_operation
+        # print(f"Sorting time: {time_operation}")
 
         return data
     

pygeoapi/provider/speckle_utils/coords_utils.py

@@ -13,7 +13,10 @@ def reproject_bulk(self, all_coords: List[List[List[float]]], all_coord_counts:
     time1 = datetime.now()
     flat_coords = reproject_2d_coords_list(self, all_coords)
     time2 = datetime.now()
-    print(f"Reproject time: {(time2-time1).total_seconds()}")
+
+    time_operation = (time2-time1).total_seconds()
+    self.times["time_reproject"] = time_operation
+    # print(f"Reproject time: {time_operation}")
 
     # define type of features
     feat_coord_group_is_multi = [True if None in x else False for x in all_coord_counts]
@@ -61,7 +64,10 @@ def reproject_bulk(self, all_coords: List[List[List[float]]], all_coord_counts:
             geometry["coordinates"].extend(polygon_parts)
     
     time3 = datetime.now()
-    print(f"Construct back geometry time: {(time3-time2).total_seconds()}")
+
+    time_operation = (time3-time2).total_seconds()
+    self.times["time_reconstruct_geometry"] = time_operation
+    # print(f"Construct back geometry time: {time_operation}")
 
 def reproject_2d_coords_list(self, coords_in: List[List[float]]) -> List[List[float]]:
     """Return coordinates in a CRS of SpeckleProvider."""

pygeoapi/provider/speckle_utils/crs_utils.py

@@ -73,6 +73,7 @@ def get_set_crs_settings(self: "SpeckleProvider", commit_obj: "Base", context_li
             offset_y = crs["offset_y"]
             self.north_degrees = crs["rotation"]
             create_crs_from_wkt(self, crs["wkt"])
+            self.commit_gis = True
 
             if self.crs.to_authority() is not None:
                 data["model_crs"] = f"{self.crs.to_authority()}, {self.crs.name} "

pygeoapi/provider/speckle_utils/display_utils.py

@@ -165,12 +165,14 @@ def get_single_display_object(displayValForColor: List) -> "Base":
                 except IndexError:
                     break
         elif item is not None:
-            displayValForColor = item
+            return item
 
     mesh = Mesh.create(faces= faces, vertices=verts, colors=colors)
-    for prop in displayValForColor[0].get_member_names():
-        if prop not in ["colors", "vertices", "faces"]:
-            mesh[prop] = getattr(displayValForColor[0], prop)
+
+    if isinstance(displayValForColor, List) and len(displayValForColor)>0:
+        for prop in displayValForColor[0].get_member_names():
+            if prop not in ["colors", "vertices", "faces"]:
+                mesh[prop] = getattr(displayValForColor[0], prop)
 
     displayValForColor = mesh
     return displayValForColor
@@ -258,10 +260,35 @@ def set_default_color(context_list: List["TraversalContext"]) -> None:
             DEFAULT_COLOR = (255 << 24) + (10 << 16) + (132 << 8) + 255
             break
 
-def assign_color(self: "SpeckleProvider", obj_display, props) -> None:
+def getAllParents(tc: "TraversalContext"):
+
+    all_tc = [tc]
+    while True:
+        try:
+            parent = tc.parent
+            if parent:
+                all_tc.append(parent)
+                tc = parent
+            else:
+                break
+        except:
+            break
+
+    return all_tc
+
+def assign_color(self: "SpeckleProvider", obj_display_tc: "TraversalContext", props: Dict) -> None:
     """Get and assign color to feature displayProperties."""
 
-    from specklepy.objects.geometry import Base, Mesh, Brep
+    from specklepy.objects.geometry import Mesh, Brep
+    
+    for tc in getAllParents(obj_display_tc):
+        
+        try:
+            color = self.material_color_proxies[tc.current.applicationId]
+            props['color'] = color
+            return
+        except:
+            pass
 
     try:
         color = self.material_color_proxies[obj_display.applicationId]
@@ -274,6 +301,8 @@ def assign_color(self: "SpeckleProvider", obj_display, props) -> None:
     color = DEFAULT_COLOR
     opacity = None
 
+    obj_display = obj_display_tc.current
+
     try:
         # prioritize renderMaterials for Meshes & Brep
         if isinstance(obj_display, Mesh) or isinstance(obj_display, Brep): 
@@ -336,12 +365,12 @@ def get_r_g_b(rgb: int) -> Tuple[int, int, int]:
         a = 255
     return a, r, g, b
 
-def assign_display_properties(self: "SpeckleProvider", feature: Dict, f_base: "Base",  obj_display: "Base") -> None:
+def assign_display_properties(self: "SpeckleProvider", feature: Dict, f_base: "Base",  obj_display_tc: "TraversalContext") -> None:
     """Assign displayProperties to the feature."""
     
     from specklepy.objects.geometry import Mesh, Brep    
 
-    assign_color(self, obj_display, feature["displayProperties"])
+    assign_color(self, obj_display_tc, feature["displayProperties"])
     feature["properties"]["color"] = feature["displayProperties"]["color"]
 
     # other properties for rendering 

pygeoapi/provider/speckle_utils/feature_utils.py

@@ -10,7 +10,10 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
     from pygeoapi.provider.speckle_utils.converter_utils import assign_geometry
     from pygeoapi.provider.speckle_utils.display_utils import find_display_obj, assign_display_properties, find_list_of_display_obj
 
-    print(f"Creating features..")
+    from specklepy.objects.graph_traversal.traversal import TraversalContext
+    from specklepy.objects.other import Collection
+
+    # print(f"Creating features..")
     time1 = datetime.now()
     
     all_props = []
@@ -19,6 +22,9 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
     if self.requested_data_type != "projectcomments":
         for item in context_list:
 
+            if item.current.speckle_type.endswith("Collection") or item.current.speckle_type.endswith("Layer") or item.current.speckle_type.endswith("Proxy"):
+                continue
+
             if feature_count >= self.limit:
                 self.limit_message = f" (feature count limited to {self.limit})"
                 break
@@ -28,9 +34,13 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
             f_fid = feature_count + 1
 
             # initialize feature
+            speckle_type = item.current.speckle_type
+            if ":" in speckle_type:
+                speckle_type = speckle_type.split(":")[-1]
+
             feature: Dict = {
                 "type": "Feature",
-                # "bbox": [-180.0, -90.0, 180.0, 90.0],
+                #"bbox": [-180.0, -90.0, 180.0, 90.0], should not be in degrees
                 "geometry": {},
                 "displayProperties":{
                     "object_type": "geometry",
@@ -38,7 +48,7 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
                 "properties": {
                     "id": f_id,
                     "FID": f_fid,
-                    "speckle_type": item.current.speckle_type.split(":")[-1],
+                    "speckle_type": speckle_type,
                 },
             }
 
@@ -67,8 +77,11 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
                         if prop not in all_props:
                             all_props.append(prop)
                     
-                    assign_display_properties(self, feature, f_base,  obj_get_color)
+                    obj_get_color_tc = TraversalContext(obj_get_color, "", item)
+
+                    assign_display_properties(self, feature, f_base,  obj_get_color_tc)
                     feature["max_height"] = max([c[2] for c in coords])
+                    feature["bbox"] = get_feature_bbox(coords)
                     data["features"].append(feature)
                     feature_count += 1
                 
@@ -81,7 +94,7 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
                     f_fid = feature_count + 1
                     feature_new: Dict = {
                         "type": "Feature",
-                        # "bbox": [-180.0, -90.0, 180.0, 90.0],
+                        #"bbox": [-180.0, -90.0, 180.0, 90.0], should not be in degrees
                         "geometry": {},
                         "displayProperties":{
                             "object_type": "geometry",
@@ -107,11 +120,14 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
                         all_coords.extend(coords)
                         all_coord_counts.append(coord_counts)
 
-                        assign_display_properties(self, feature_new, f_base,  obj_get_color)
+                        obj_get_color_tc = TraversalContext(obj_get_color, "", item)
+
+                        assign_display_properties(self, feature_new, f_base,  obj_get_color_tc)
                         feature_new["max_height"] = max([c[2] for c in coords])
+                        feature_new["bbox"] = get_feature_bbox(coords)
                         data["features"].append(feature_new)
                         feature_count +=1
-  
+
         assign_missing_props(data["features"], all_props)
     else:
         ####################### create comment features
@@ -156,7 +172,20 @@ def initialize_features(self: "SpeckleProvider", all_coords, all_coord_counts, d
         raise ValueError("No supported features found")
     
     time2 = datetime.now()
-    print(f"Creating features time: {(time2-time1).total_seconds()}")
+
+    time_operation = (time2-time1).total_seconds()
+    self.times["time_creating_features"] = time_operation
+    # print(f"Creating features time: {time_operation}")
+
+def get_feature_bbox(coords) -> List[float]:
+    """Get min max coordinates of the feature."""
+    
+    x0 = min([c[0] for c in coords])
+    x1 = max([c[0] for c in coords])
+    y0 = min([c[1] for c in coords])
+    y1 = max([c[1] for c in coords])
+
+    return [x0, y0, x1, y1]
 
 def assign_comment_data(comments, properties):
     """Create html text to display for the thread."""

pygeoapi/provider/speckle_utils/patch/server.py

@@ -168,8 +168,23 @@ class ServerTransport(AbstractTransport):
         # iter through returned objects saving them as we go
         target_transport.begin_write()
         all_lines = [line for _,line in enumerate(lines)]
+
+        # fix wrongly split lines 
         for i, line in enumerate(all_lines):
-            if line:
+            if line and i!= 0 and (len(line)<=10 or'"id": "' not in line[:10]):
+                # find the last line with ID
+                matching_index = -1
+                for k, id_line in enumerate(all_lines):
+                    if k<i and '"id": "' in id_line:
+                        matching_index = k
+                    if k==i:
+                        break
+                if matching_index != -1:
+                    all_lines[matching_index] += "},{" + line
+                    all_lines[i] = ""
+
+        for i, line in enumerate(all_lines):
+            if line and len(line)>10 and '"id": "' in line[:10]:
                 hash = line.split('"id": "')[1].split('"')[0]
                 obj = "{" + line + "}"
                 if i==0:

pygeoapi/provider/speckle_utils/server_utils.py

@@ -216,4 +216,15 @@ def get_attachment(project_id: str, attachment_id: str, attachment_name: str) ->
         raise Exception(
             f"Request not successful: Response code {r.status_code}"
         )
-    
+
+def set_actions(self: "SpeckleProvider", client: "SpeckleClient"):
+    from specklepy.logging.metrics import track
+    try:
+        full_dict = {**self.url_params, **self.times}
+        full_dict["GIS commit"] = self.commit_gis
+        full_dict["model"] = f"{self.project_name}, {self.model_name}"
+        full_dict["time_TOTAL"] = sum([x[1] for x in self.times.items()])
+        full_dict["model_url"] = self.speckle_url
+        track("GEO receive", client.account, full_dict)
+    except:
+        pass

pygeoapi/provider/speckle_utils/url_utils.py

@@ -1,65 +1,104 @@
 
 
-from typing import Dict
+import inspect
 
 
 def get_set_url_parameters(self: "SpeckleProvider"):
+    """Parse and save URL parameters."""
 
     from pygeoapi.provider.speckle_utils.crs_utils import create_crs_from_authid
-
-    if (
-        isinstance(self.data, str)
-        and "speckleurl=" in self.data.lower()
-        and "projects" in self.data
-        and "models" in self.data
-    ):
-        crs_authid = ""
+    
+    crsauthid = False
+    
+    if (isinstance(self.data, str)):
+        
         for item in self.data.lower().split("&"):
-
             # if CRS authid is found, rest will be ignored
-            if "datatype=" in item:
+            if "speckleurl=" in item:
                 try:
-                    self.requested_data_type = item.split("datatype=")[1]
-                    if self.requested_data_type not in ["points", "lines", "polygons", "projectcomments"]:
-                        self.requested_data_type = "polygons (default)"
+                    speckle_url = item.split("speckleurl=")[1]
+                    if "/projects/" not in speckle_url or "/models/" not in speckle_url:
+                        raise ValueError(f"Provide valid Speckle Model URL: {item}")
+
+                    if speckle_url[-1] == "/":
+                        speckle_url = speckle_url[:-1]
+                    self.speckle_project_url = speckle_url.split("/models")[0]
                 except:
-                    pass
-                
+                    raise ValueError(f"Provide valid Speckle Model URL: {item}")
+
+            elif "datatype=" in item:
+                try:
+                    requested_data_type = item.split("datatype=")[1]
+                    if requested_data_type in ["points", "lines", "polygons", "projectcomments"]:
+                        self.requested_data_type = requested_data_type
+                        self.url_params["url_data_type"] = requested_data_type
+                except:
+                    raise ValueError(f"Provide valid dataType parameter (points/lines/polygons/projectcomments): {item}")     
+            
             elif "preserveattributes=" in item:
                 try:
-                    self.preserve_attributes = item.split("preserveattributes=")[1]
-                    if self.preserve_attributes not in ["true", "false"]:
-                        self.preserve_attributes = "false (default)"
+                    preserve_attributes = item.split("preserveattributes=")[1]
+                    if preserve_attributes in ["true", "false"]:
+                        self.preserve_attributes = preserve_attributes
+                        self.url_params["url_preserve_attributes"] = preserve_attributes
                 except:
-                    pass
+                    ValueError(f"Provide valid preserverAttributes parameter (true/false): {item}")
 
-            elif "limit=" in item:
-                try:
-                    self.limit = int(item.split("limit=")[1])
-                except:
-                    pass
-                
             elif "crsauthid=" in item:
                 crs_authid = item.split("crsauthid=")[1]
+                if isinstance(crs_authid, str) and len(crs_authid)>3:
+                    crsauthid = True
+                    self.crs_authid = crs_authid
+                    self.url_params["url_crs_authid"] = crs_authid
+
             elif "lat=" in item:
                 try:
-                    self.lat = float(item.split("lat=")[1])
+                    lat = float(item.split("lat=")[1])
+                    self.lat = lat
+                    self.url_params["url_lat"] = lat
                 except:
-                    pass
-                    # raise ValueError(f"Invalid Lat input, must be numeric: {item.split('lat=')[1]}")
+                    raise ValueError(f"Invalid Lat input, must be numeric: {item}")
             elif "lon=" in item:
                 try:
-                    self.lon = float(item.split("lon=")[1])
+                    lon = float(item.split("lon=")[1])
+                    self.lon = lon
+                    self.url_params["url_lon"] = lon
                 except:
-                    pass
-                    # raise ValueError(f"Invalid Lon input, must be numeric: {item.split('lon=')[1]}")
+                    raise ValueError(f"Invalid Lon input, must be numeric: {item}")
             elif "northdegrees=" in item:
                 try:
-                    self.north_degrees = float(item.split("northdegrees=")[1])
+                    north_degrees = float(item.split("northdegrees=")[1])
+                    self.north_degrees = north_degrees
+                    self.url_params["url_north_degrees"] = north_degrees
                 except:
-                    pass
-                    # raise ValueError(f"Invalid NorthDegrees input, must be numeric: {item.split('northdegrees=')[1]}")
+                    raise ValueError(f"Invalid northDegrees input, must be numeric: {item}")    
+            elif "limit=" in item:
+                try:
+                    limit = int(item.split("limit=")[1])
+                    if limit>0: 
+                        self.limit = limit
+                        self.url_params["url_limit"] = limit
+                except:
+                    ValueError(f"Invalid limit input, must be a positive integer: {item}")
+                 
+            elif "useragent=" in item:
+                try:
+                    agent = item.split("useragent=")[1]
+                    self.user_agent = agent
+                    self.url_params["user_agent"] = agent
+                except:
+                    ValueError(f"Invalid limit input, must be a positive integer: {item}")
+                
+
+        if self.speckle_url == "-":
+            self.missing_url = "true"
+
+        # if CRS authid is found, rest will be ignored
+        if crsauthid:
+            self.lat = str(self.lat) + " (not applied)"
+            self.lon = str(self.lon) + " (not applied)"
+            self.north_degrees = str(self.north_degrees) + " (not applied)"
 
         # if CRS parameter present, create and assign CRS:
-        if len(crs_authid)>3:
+        if len(self.crs_authid)>3:
             create_crs_from_authid(self)

pygeoapi/templates/_base.html

@@ -71,7 +71,7 @@
     <meta name="language" content="{{ config['server']['language'] }}">
     <meta name="description" content="{{ config['metadata']['identification']['title'] }}">
     <meta name="keywords" content="{{ config['metadata']['identification']['keywords']|join(',') }}">
-    <link rel="shortcut icon" href="{{ config['server']['url'] }}/static/img/speckle_geo.png" type="image/x-icon">
+    <link rel="shortcut icon" href="https://github.com/specklesystems/pygeoapi/blob/dev/pygeoapi/static/img/speckle_geo.png" type="image/x-icon">
     <link rel="stylesheet" href="https://unpkg.com/bootstrap@5.1.3/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="{{ config['server']['url'] }}/static/css/default.css">
     <!--[if lt IE 9]>
@@ -109,11 +109,9 @@
               title="{{ config['metadata']['identification']['title'] }}" style="height:30px;vertical-align: middle;" /> 
             <b style="text-align:left;padding-left: 10px;">Speckle</b> 
         </a>
-        <p style="text-align:left;padding-left: 10px;" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
-          <a href="https://geo.speckle.systems/" target="_blank" style="text-align:left;padding-left: 10px;" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
+        <a href="https://geo.speckle.systems/" target="_blank" style="text-align:left;padding-left: 10px;" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
             > Geolocating your data 
-            </a>
-        </p> 
+        </a>
         {% if (data["model"] and data["model"]!="") %}
         <a href="{{data['speckle_project_url']}}" target="_blank" style="text-align:left;padding-left: 10px;" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
           > {{data["project"]}} >

pygeoapi/templates/collections/items/index.html

@@ -15,7 +15,7 @@
   
 
   <div class="row">
-    {% if not data['missing_url'] %}
+    {% if data['speckle_url'] %}
     
 
     <div id="map2d" style="height: 80vh;"></div>
@@ -53,7 +53,7 @@
         </p>
       </tr>
       
-      {% if data['missing_url'] %}
+      {% if not data['speckle_url'] %}
       <tr>
         <p>
           <div  style="height: fit-content;">
@@ -335,7 +335,10 @@
 {% block extrafoot %}
 
     <script>
-      document.getElementById("loading_screen").remove();
+      try {
+        document.getElementById("loading_screen").remove();
+      }
+      catch(err) {}
 
       // attach even to modeSwitch btn
       document.getElementById("modeSwitch").onclick = switchMode;
@@ -357,67 +360,97 @@
         }
       }
 
+      function split_polygons(geojson_data){
+          features = []
+          geojson_data.forEach((element, index) => {
+              if (element.geometry.type == "MultiPolygon"){
+                  // mesh faces are stored as parts, so most buildings might have hundreds of parts with just 1 loop or 3-4pts
+                  all_parts = element.geometry.coordinates;
+                  
+                  // loops are usually simple (3-4 vertices), and usually only loop
+                  for (polyPart of all_parts){
+                      new_coordinates = [polyPart];
+                      new_element = {"id": element.properties.id, "type":"Feature", 
+                          "geometry": {"type": "MultiPolygon", "coordinates": new_coordinates}, 
+                          "properties": element.properties,
+                          "displayProperties": element.displayProperties };
+
+                      features.push(new_element)
+                      }
+              }
+              else {
+                  features.push(element)
+              }
+          });  
+
+          return features
+      }
 
       var data = {{ data | to_json | safe }};
-      var geojson_data = {{ data['features'] | to_json | safe }};
-
+      var geojson_data_original = {{ data['features'] | to_json | safe }};
+      
       // Leaflet 2d map 
       function initialize2d() {
-        var map = L.map('map2d').setView([45, 0], 2);
-        map.addLayer(new L.TileLayer(
-            '{{ config['server']['map']['url'] }}', {
-                maxZoom: 22,
-                attribution: '{{ config['server']['map']['attribution'] | safe }}  &copy; Data: <a href="https://speckle.systems/">Speckle Systems</a>'
-            }
-        ));
+          var map = L.map('map2d', {zoomControl: false}).setView([45, 0], 2);
+          L.control.zoom({
+              position: 'topright'
+          }).addTo(map);
+          map.addLayer(new L.TileLayer(
+              '{{ config['server']['map']['url'] }}', {
+                  maxZoom: 22,
+                  attribution: '{{ config['server']['map']['attribution'] | safe }}  &copy; Data: <a href="https://speckle.systems/">Speckle Systems</a>'
+              }
+          ));
 
-        var items = new L.GeoJSON(geojson_data, {
-            filter: (feature) => {
-              return feature.displayProperties["object_type"] == "geometry"
-            },
-            pointToLayer: (feature, latlng) => {
-                return new L.circleMarker(latlng)            
-            },
-            onEachFeature: function (feature, layer) {
-                var url = '{{ data['speckle_project_url'] }}/models/' + feature.id.split("_")[0]
-                var html = '<span><td><p>' + feature['properties']['speckle_type'] + '</p></td><a href="' + url + '" target="_blank">' + feature['properties']['id'].split("_")[0] + '</a></span>';
-                layer.bindPopup(html);
+          geojson_data = split_polygons(geojson_data_original);
 
-                var myFillColor = feature.displayProperties['color'];
-                var mylineWeight = feature.displayProperties['lineWidth'];
-                var myRadius = feature.displayProperties['radius'];
+          var items = new L.GeoJSON(geojson_data, {
+              filter: (feature) => {
+                return feature.displayProperties["object_type"] == "geometry"
+              },
+              pointToLayer: (feature, latlng) => {
+                  return new L.circleMarker(latlng)            
+              },
+              onEachFeature: function (feature, layer) {
+                  var url = '{{ data['speckle_project_url'] }}/models/' + feature.id.split("_")[0]
+                  var html = '<span><td><p>' + feature['properties']['speckle_type'] + '</p></td><a href="' + url + '" target="_blank">' + feature['properties']['id'].split("_")[0] + '</a></span>';
+                  layer.bindPopup(html);
 
-                layer.setStyle({
-                    fillColor: myFillColor,
-                    color: myFillColor,
-                    fillOpacity: 0.8,
-                    weight: mylineWeight,
-                    radius: myRadius
-                });
-            }
-        }); //.addTo(map);
-        
-        var comments = new L.GeoJSON(geojson_data, {
-            filter: (feature) => {
-              return feature.displayProperties["object_type"] == "comment"
-            },
-            pointToLayer: (feature, latlng) => {
-                return new L.marker(latlng)            
-            },
-            onEachFeature: function (feature, layer) {
-                var url = '{{ data['speckle_project_url'] }}/models/' + feature.properties.resource_id + '#threadId=' + feature.id; 
-                var html = '<span><td><a href="' + url + '" target="_blank">Go to thread</a></td> <td><p>' + feature['properties']['text_html'] + '</p></td>  </span>';
-                layer.bindPopup(html);
-            }
-        }); //.addTo(map);
+                  var myFillColor = feature.displayProperties['color'];
+                  var mylineWeight = feature.displayProperties['lineWidth'];
+                  var myRadius = feature.displayProperties['radius'];
 
-        var group = L.featureGroup([items, comments])
-        .addTo(map);
+                  layer.setStyle({
+                      fillColor: myFillColor,
+                      color: myFillColor,
+                      fillOpacity: 0.8,
+                      weight: mylineWeight,
+                      radius: myRadius
+                  });
+              }
+          }); //.addTo(map);
+          
+          var comments = new L.GeoJSON(geojson_data, {
+              filter: (feature) => {
+                return feature.displayProperties["object_type"] == "comment"
+              },
+              pointToLayer: (feature, latlng) => {
+                  return new L.marker(latlng)            
+              },
+              onEachFeature: function (feature, layer) {
+                  var url = '{{ data['speckle_project_url'] }}/models/' + feature.properties.resource_id + '#threadId=' + feature.id; 
+                  var html = '<span><td><a href="' + url + '" target="_blank">Go to thread</a></td> <td><p>' + feature['properties']['text_html'] + '</p></td>  </span>';
+                  layer.bindPopup(html);
+              }
+          }); //.addTo(map);
 
-        //map.addLayer(lines);
+          var group = L.featureGroup([items, comments])
+          .addTo(map);
 
-        map.fitBounds(group.getBounds());
-        // map.setZoom(19); // in order for the tiles to load
+          //map.addLayer(lines);
+
+          map.fitBounds(group.getBounds());
+          // map.setZoom(19); // in order for the tiles to load
       };
 
 
@@ -504,11 +537,20 @@
               coords = feature.geometry.coordinates;
 
               if (feature.geometry.type.includes("Polygon")) {
-                  polygons = []
 
-                  // check orientation of each PolygonPart, if vertical - shift points slightly
+                  polygon_all_parts = []
+                  // iterate through Polygon Parts
                   for (let p = 0; p < coords.length; p++) {
+
+                      // check orientation of each PolygonPart, if vertical - shift points slightly
+                      polygon_part = [];
+                      inner = false;
+
                       for (let c = 0; c < coords[p].length; c++) {
+                          polygon_part_loop = [];
+                          if (c>0){
+                            inner = true;
+                          }
 
                           sum_orientation = 0;
                           polygon_pts = coords[p][c]; // usually 3 for Mesh faces
@@ -521,7 +563,9 @@
                           };
 
                           createdPolygon = false;
-                          if (-0.01 < sum_orientation && sum_orientation <0.01){
+                          
+                          if (-0.000000001 < sum_orientation && sum_orientation <0.000000001){
+
                               coords[p][c][0][0] += 0.0000001;
                               coords[p][c][0][1] += 0.0000001;
 
@@ -530,46 +574,60 @@
 
                               coords[p][c][2][0] += 0.0000001;
                               coords[p][c][2][1] += 0.0000001;
+
                               if(polygon_pts.length==3) {
                                 createdPolygon = true;
 
-                                multipolygon_coords = [coords[p][c]];
-                                polygons.push({"id": speckle_features.length, "type":"Feature", 
-                                    "geometry": {"type": "MultiPolygon", "coordinates":[multipolygon_coords]}, 
-                                    "properties": speckle_data.features[i].properties,
-                                    "displayProperties": speckle_data.features[i].displayProperties });
+                                multipolygon_coords = coords[p][c];
+                                polygon_part_loop = multipolygon_coords;
+
+                                polygon_part = [polygon_part_loop];
+                                polygon_all_parts.push(polygon_part);                                
                                           
                               }
                               else if (polygon_pts.length==4) {
                                   createdPolygon = true;
 
-                                  multipolygon_coords = [coords[p][c].slice(0,3)];
-                                  polygons.push({"id": speckle_features.length, "type":"Feature", 
-                                      "geometry": {"type": "MultiPolygon", "coordinates":[multipolygon_coords]}, 
-                                      "properties": speckle_data.features[i].properties,
-                                      "displayProperties": speckle_data.features[i].displayProperties });
+                                  multipolygon_coords = coords[p][c].slice(0,3);
+                                  polygon_part_loop = multipolygon_coords;
 
-                                  multipolygon_coords = [[coords[p][c][2], coords[p][c][3], coords[p][c][0]]];
-                                  polygons.push({"id": speckle_features.length, "type":"Feature", 
-                                      "geometry": {"type": "MultiPolygon", "coordinates":[multipolygon_coords]}, 
-                                      "properties": speckle_data.features[i].properties ,
-                                      "displayProperties": speckle_data.features[i].displayProperties });
+                                  polygon_part = [polygon_part_loop];
+                                  polygon_all_parts.push(polygon_part);
+
+                                  /////////
+                                  multipolygon_coords = [coords[p][c][2], coords[p][c][3], coords[p][c][0]];
+                                  polygon_part_loop = multipolygon_coords;
+
+                                  polygon_part = [polygon_part_loop];
+                                  polygon_all_parts.push(polygon_part);
                               };
+                              
                           };
-                          if (createdPolygon == false){
-                              multipolygon_coords = [coords[p][c]];
-                              polygons.push({"id": speckle_features.length, "type":"Feature", 
-                                  "geometry": {"type": "MultiPolygon", "coordinates":[multipolygon_coords]}, 
-                                  "properties": speckle_data.features[i].properties,
-                                  "displayProperties": speckle_data.features[i].displayProperties });
+                          if (createdPolygon == false){ // if non-vertical, or vertical with more than 4 vertices
+                              
+                              multipolygon_coords = coords[p][c];
+                              polygon_part_loop = multipolygon_coords;
+
+                              if (inner == false){ 
+                                  polygon_part = [polygon_part_loop];
+                                  polygon_all_parts.push(polygon_part);
+                                }
+                              else{ 
+                                  polygon_all_parts[polygon_all_parts.length-1].push(polygon_part_loop);
+                              }
                           }
                           
                       };
+                      
                   };
-                  polygons.forEach((element, index, array) => {
-                    element.displayProperties.lineWidth = 0.05
-                    speckle_features.push(element);
-                  });
+                  
+                  new_polygon = {"id": speckle_features.length, "type":"Feature", 
+                          "geometry": {"type": "MultiPolygon", "coordinates":polygon_all_parts}, 
+                          "properties": speckle_data.features[i].properties,
+                          "displayProperties": speckle_data.features[i].displayProperties };
+
+                  new_polygon.displayProperties.lineWidth = 0.05
+                  speckle_features.push(new_polygon);
 
               } 
               else if (speckle_data.features[i].displayProperties.object_type == "comment")

pygeoapi/templates/error_screen.html

@@ -9,7 +9,10 @@
 </body>
 
 <script>
-  document.getElementById("loading_screen").remove();
+  try {
+    document.getElementById("loading_screen").remove();
+  }
+  catch(err) {}
 </script>
 
 </html>

pygeoapi/templates/exception.html

@@ -5,4 +5,10 @@
       <h2>{% trans %}Exception{% endtrans %}</h2>
       <p>{{ data['description'] }}</p>
     </section>
+    <script>
+      try {
+        document.getElementById("loading_screen").remove();
+      }
+      catch(err) {}
+    </script>
 {% endblock %}

speckle_demos/demo_leaflet_all_data.html

@@ -86,7 +86,7 @@
             });
 
             // construnt data URL
-            var link = "https://geo.speckle.systems/?speckleUrl=";
+            var link = "https://geo.speckle.systems/speckle/?speckleUrl=";
             if (document.getElementById("speckle_model").value!=""){
                 link += document.getElementById("speckle_model").value.replace(" ", "")
             }

speckle_demos/demo_leaflet_comments.html

@@ -34,7 +34,7 @@
         ));
         
         (async () => {
-                const speckle_data = await fetch('https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=projectcomments', {
+                const speckle_data = await fetch('https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=projectcomments', {
                    headers: {
                      'Accept': 'application/geo+json'
                    }

speckle_demos/demo_leaflet_masterplan.html

@@ -34,7 +34,7 @@
         ));
         
         (async () => {
-                const speckle_data = await fetch('https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=polygons', {
+                const speckle_data = await fetch('https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=polygons', {
                    headers: {
                      'Accept': 'application/geo+json'
                    }

speckle_demos/demo_maptalks_comments.html

@@ -32,7 +32,7 @@
       
              
       (async () => {
-                const speckle_data2 = await fetch('https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/37d93c5d32&preserveAttributes=true', {
+                const speckle_data2 = await fetch('https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/37d93c5d32&preserveAttributes=true', {
                 //const speckle_data = await fetch('http://localhost:5000/?speckleUrl=https://app.speckle.systems/projects/64753f52b7/models/338b386787&limit=1000000&lat=-0.031405&lon=109.335828&preserveAttributes=true', {
                    headers: {
                      'Accept': 'application/geo+json'
@@ -155,7 +155,7 @@
                 
                 //map.fitBounds(speckle_layer.getBounds())
 
-                const speckle_data = await fetch('https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=projectcomments', {
+                const speckle_data = await fetch('https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=projectcomments', {
                 //const speckle_data = await fetch('http://localhost:5000/?speckleUrl=https://app.speckle.systems/projects/64753f52b7/models/338b386787&limit=1000000&lat=-0.031405&lon=109.335828&preserveAttributes=true', {
                    headers: {
                      'Accept': 'application/geo+json'

speckle_demos/demo_maptalks_polygons.html

@@ -30,12 +30,12 @@
       });
       
       (async () => {
-                //const speckle_data = await fetch('https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=projectcomments', {
-                //var speckle_url = 'http://localhost:5000/?speckleUrl=https://app.speckle.systems/projects/5feae56049/models/9c43d7569c&limit=1000000&datatype=polygons&preserveattributes=false';
+                //const speckle_data = await fetch('https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=projectcomments', {
+                //var speckle_url = 'http://localhost:5000/speckle/?speckleUrl=https://app.speckle.systems/projects/5feae56049/models/9c43d7569c&limit=1000000&datatype=polygons&preserveattributes=false';
                 // https://app.speckle.systems/projects/5feae56049/models/01c4183677
-                var speckle_url = 'http://localhost:5000/?speckleUrl=https://app.speckle.systems/projects/5feae56049/models/01c4183677&limit=1000000&datatype=polygons&preserveattributes=true';
+                var speckle_url = 'https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/5feae56049/models/01c4183677&limit=1000000&datatype=polygons&preserveattributes=true';
                 
-                //var speckle_url = 'https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/5feae56049/models/9c43d7569c&northDegrees=-30&preserveAttributes=true';
+                //var speckle_url = 'https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/5feae56049/models/9c43d7569c&northDegrees=-30&preserveAttributes=true';
                 const speckle_data = await fetch(speckle_url, {
                    headers: {
                      'Accept': 'application/geo+json'

speckle_demos/demo_openlayers_masterplan.html

@@ -65,7 +65,7 @@
 
         //////// add Speckle layer
         (async () => {
-            const geojson = await fetch('https://geo.speckle.systems/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=polygons', {
+            const geojson = await fetch('https://geo.speckle.systems/speckle/?speckleUrl=https://app.speckle.systems/projects/344f803f81/models/5582ab673e&datatype=polygons', {
                 headers: {
                 'Accept': 'application/geo+json'
                 }