Fix (Collection): fix blender receive

speckle_connector/src/constants/type_constants.rb

@@ -6,6 +6,7 @@ module SpeckleConnector
   OBJECTS_GIS_POLYGONELEMENT = 'Objects.GIS.PolygonElement'
 
   OBJECTS_BUILTELEMENTS_VIEW3D = 'Objects.BuiltElements.View:Objects.BuiltElements.View3D'
+  OBJECTS_BUILTELEMENTS_NETWORK = 'Objects.BuiltElements.Network'
   OBJECTS_BUILTELEMENTS_REVIT_DIRECTSHAPE = 'Objects.BuiltElements.Revit.DirectShape'
   OBJECTS_BUILTELEMENTS_REVIT_LEVEL = 'Objects.BuiltElements.Level:Objects.BuiltElements.Revit.RevitLevel'
 

speckle_connector/src/convertors/to_native.rb

@@ -13,6 +13,7 @@ require_relative '../speckle_objects/geometry/point'
 require_relative '../speckle_objects/geometry/line'
 require_relative '../speckle_objects/geometry/mesh'
 require_relative '../speckle_objects/built_elements/view3d'
+require_relative '../speckle_objects/built_elements/network'
 require_relative '../speckle_objects/speckle/core/models/collection'
 require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
 
@@ -66,6 +67,7 @@ module SpeckleConnector
         Objects.Other.RenderMaterial
         Objects.Other.Instance:Objects.Other.BlockInstance
         Objects.BuiltElements.View:Objects.BuiltElements.View3D
+        Objects.BuiltElements.Network
         Objects.GIS.PolygonElement
         Speckle.Core.Models.Collection
       ].freeze
@@ -91,10 +93,11 @@ module SpeckleConnector
         # @Named Views are exception here. It does not mean a layer. But it is anti-pattern for now.
         # layers_relation = obj['layers_relation']
 
-        layers_relation = SpeckleObjects::Relations::Layers.extract_relations(obj)
-
-        # Create layers and it's folders from layers relation on the model collection.
-        SpeckleObjects::Relations::Layers.to_native(layers_relation, sketchup_model) if layers_relation && !from_revit
+        unless from_revit
+          layers_relation = SpeckleObjects::Relations::Layers.extract_relations(obj)
+          # Create layers and it's folders from layers relation on the model collection.
+          SpeckleObjects::Relations::Layers.to_native(layers_relation, sketchup_model) if layers_relation
+        end
 
         # By default entities to fill is sketchup model's entities.
         @entities_to_fill = sketchup_model.entities
@@ -263,7 +266,7 @@ module SpeckleConnector
       # rubocop:enable Metrics/PerceivedComplexity
 
       def speckle_object_to_native(obj)
-        return DISPLAY_VALUE.method(:to_native) unless obj['displayValue'].nil?
+        return DISPLAY_VALUE.method(:to_native) unless obj['displayValue'].nil? && obj['@displayValue'].nil?
 
         SPECKLE_OBJECT_TO_NATIVE[obj['speckle_type']]
       end
@@ -280,6 +283,7 @@ module SpeckleConnector
         OBJECTS_OTHER_RENDERMATERIAL => RENDER_MATERIAL.method(:to_native),
         OBJECTS_BUILTELEMENTS_VIEW3D => VIEW3D.method(:to_native),
         OBJECTS_BUILTELEMENTS_REVIT_DIRECTSHAPE => BUILTELEMENTS::Revit::DirectShape.method(:to_native),
+        OBJECTS_BUILTELEMENTS_NETWORK => BUILTELEMENTS::Network.method(:to_native),
         OBJECTS_GIS_POLYGONELEMENT => POLYGON_ELEMENT.method(:to_native),
         SPECKLE_CORE_MODELS_COLLECTION => COLLECTION.method(:to_native)
       }.freeze
@@ -302,9 +306,9 @@ module SpeckleConnector
         # Create speckle entities from sketchup entities to achieve continuous traversal.
         convert_to_speckle_entities(state, obj, converted_entities)
       rescue StandardError => e
-          puts("Failed to convert #{obj['speckle_type']} (id: #{obj['id']})")
-          puts(e)
-          return state
+        puts("Failed to convert #{obj['speckle_type']} (id: #{obj['id']})")
+        puts(e)
+        return state
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity

speckle_connector/src/speckle_objects/built_elements/network.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../../constants/type_constants'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      # Network object represents scenes on Sketchup.
+      class Network < Base
+        SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_NETWORK
+
+        def self.to_native(state, network, layer, entities, &convert_to_native)
+          network['elements'].each do |element|
+            state = convert_to_native.call(state, element['elements'], layer, entities)
+          end
+
+          return state, []
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/geometry/mesh.rb

@@ -120,7 +120,7 @@ module SpeckleConnector
           mesh_layer_name = SketchupModel::Query::Layer.entity_layer_from_path(mesh['layer'])
           mesh_layer = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == mesh_layer_name }
           added_faces.each do |face|
-            face.layer = mesh_layer.nil? ? layer : mesh_layer
+            face.layer = mesh_layer unless mesh_layer.nil?
             # Smooth edges if they already soft
             # FIXME: Below line should be reconsidered. It might be a good to know here mesh comes from NURBS or not.
             face.edges.each { |edge| edge.smooth = true if edge.soft? } if has_any_non_planar_quad_mesh

speckle_connector/src/speckle_objects/other/display_value.rb

@@ -70,10 +70,12 @@ module SpeckleConnector
         end
 
         def self.collect_definition_geometries(obj)
-          obj['geometry'] = obj['displayValue']
+          obj['geometry'] = obj['displayValue'] || obj['@displayValue']
 
-          if !obj['elements'].nil? && obj['elements'].is_a?(Array)
-            obj['elements'].each do |element|
+          elements = obj['elements'] || obj['@elements']
+
+          if !elements.nil? && elements.is_a?(Array)
+            elements.each do |element|
               # Mullions is a special case here, they are extracted as base object with @displayValue from revit..
               if element['@displayValue'].nil?
                 obj['geometry'].append(element)

speckle_connector/src/speckle_objects/speckle/core/models/collection.rb

@@ -31,10 +31,8 @@ module SpeckleConnector
 
               if collection_type.include?('model')
                 ModelCollection.to_native(state, collection, layer, entities, &convert_to_native)
-              elsif ['layer', 'Revit Category'].include?(collection_type)
-                LayerCollection.to_native(state, collection, layer, entities, &convert_to_native)
               else
-                return state, []
+                LayerCollection.to_native(state, collection, layer, entities, &convert_to_native)
               end
             end
           end

ui/src/plugins/speckle-metrics.js

@@ -26,9 +26,11 @@ const SpeckleMetrics = {
           .digest('hex')
           .toUpperCase()
 
+      let serverUrl = new URL(localStorage.getItem('serverUrl'))
+
       let serverId = crypto
         .createHash('md5')
-        .update(localStorage.getItem('serverUrl').toLowerCase())
+        .update(serverUrl.hostname.toLowerCase())
         .digest('hex')
         .toUpperCase()