Fix (Collection): fix blender receive

- Clear, Isolate, Hide, Select

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     axiom-types (0.1.1)
@@ -26,7 +26,7 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    git (1.12.0)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     ice_nine (0.11.2)
@@ -48,8 +48,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (3.3.4)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rchardet (1.8.0)

speckle_connector/debug.rb

@@ -15,7 +15,9 @@ module SpeckleConnector
   def self.reload
     load(__FILE__)
     pattern = File.join(__dir__, '**/*.rb')
-    Dir.glob(pattern).each { |file| load(file) }
+    # TODO: Here is a opportunity to improve reloading process.
+    #  We can cache last edited time of the each file later to check which file need to be reloaded.
+    Dir.glob(pattern).each { |file| load(file) unless file.include?('bootstrap') }
        .size
   end
   # rubocop:enable SketchupSuggestions/FileEncoding

speckle_connector/src/actions/apply_mappings.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative 'mapped_entities_updated'
+require_relative 'events/selection_event_action'
+require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Apply mappings for selected entities.
+    class ApplyMappings < Action
+      def initialize(entities_to_map, method, category, name, is_definition)
+        super()
+        @entities_to_map = entities_to_map
+        @method = method
+        @category = category
+        @name = name
+        @is_definition = is_definition
+      end
+
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/MethodLength
+      def update_state(state)
+        sketchup_model = state.sketchup_state.sketchup_model
+        entities = if sketchup_model.active_path.nil?
+                     sketchup_model.entities
+                   else
+                     sketchup_model.active_path.last.definition.entities
+                   end
+
+        # Collect entities from entity ids that comes from UI as list
+        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id) }
+
+        # Switch to definitions if all entities are component instance and UI flag shows that
+        if entities_to_map.all? { |e| e.is_a?(Sketchup::ComponentInstance) } && @is_definition
+          entities_to_map = entities_to_map.collect(&:definition).uniq
+        end
+
+        # Store speckle state to update with mapped entities.
+        speckle_state = state.speckle_state
+        entities_to_map.each do |entity|
+          name = if @name == '<Mixed>'
+                   entity.respond_to?(:name) ? entity.name : ''
+                 else
+                   @name
+                 end
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :category, @category)
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :name, name)
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :method, @method)
+          speckle_state = speckle_state.with_mapped_entity(entity)
+        end
+
+        new_state = MappedEntitiesUpdated.update_state(state.with_speckle_state(speckle_state))
+        Events::SelectionEventAction.update_state(new_state, { apply: true })
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

speckle_connector/src/actions/clear_mappings.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative 'mapped_entities_updated'
+require_relative 'events/selection_event_action'
+require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Clear mappings for selected entities.
+    class ClearMappings < Action
+      def initialize(entities_to_map, is_definition)
+        super()
+        @entities_to_map = entities_to_map
+        @is_definition = is_definition
+      end
+
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
+      def update_state(state)
+        sketchup_model = state.sketchup_state.sketchup_model
+        entities = if sketchup_model.active_path.nil?
+                     sketchup_model.entities
+                   else
+                     sketchup_model.active_path.last.definition.entities
+                   end
+
+        # Collect entities from entity ids that comes from UI as list
+        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id) }
+
+        # Switch to definitions if all entities are component instance and UI flag shows that
+        if entities_to_map.all? { |e| e.is_a?(Sketchup::ComponentInstance) } && @is_definition
+          entities_to_map = entities_to_map.collect(&:definition).uniq
+        end
+
+        # Store speckle state to update with mapped entities.
+        speckle_state = state.speckle_state
+        entities_to_map.each do |entity|
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.remove_dictionary(entity)
+          speckle_state = speckle_state.with_removed_mapped_entity(entity)
+        end
+
+        new_state = MappedEntitiesUpdated.update_state(state.with_speckle_state(speckle_state))
+        Events::SelectionEventAction.update_state(new_state, { clear: true })
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
+    end
+  end
+end

speckle_connector/src/actions/clear_mappings_from_table.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative 'mapped_entities_updated'
+require_relative 'events/selection_event_action'
+require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Clear mappings for selected entities from mapped elements table.
+    class ClearMappingsFromTable < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state, data)
+        # Flat entities to clear mappings
+        flat_entities = SketchupModel::Query::Entity.flat_entities(state.sketchup_state.sketchup_model.entities)
+
+        # Collect entity ids to clear mappings
+        entity_ids = data.collect { |_, entities| entities['selectedElements'].collect { |e| e['entityId'] } }.flatten
+        # Store speckle state to update with mapped entities.
+        speckle_state = state.speckle_state
+        flat_entities.each do |entity|
+          next unless entity_ids.include?(entity.persistent_id)
+
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.remove_dictionary(entity)
+          speckle_state = speckle_state.with_removed_mapped_entity(entity)
+        end
+
+        new_state = MappedEntitiesUpdated.update_state(state.with_speckle_state(speckle_state))
+        Events::SelectionEventAction.update_state(new_state, { clear: true })
+      end
+    end
+  end
+end

speckle_connector/src/actions/events/selection_event_action.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'event_action'
+require_relative '../../mapping/category/revit_category'
+require_relative '../../sketchup_model/reader/speckle_entities_reader'
+require_relative '../../sketchup_model/query/entity'
+
+module SpeckleConnector
+  module Actions
+    module Events
+      # Update selected speckle objects when the selection changes for mapping tool.
+      class SelectionEventAction < EventAction
+        # @param state [States::State] the current state of Speckle application.
+        # @return [States::State] the new updated state object
+        def self.update_state(state, event_data)
+          return state unless event_data&.any?
+
+          sketchup_selection = state.sketchup_state.sketchup_model.selection
+          selection = {
+            selection: SketchupModel::Reader::SpeckleEntitiesReader.entities_schema_details(sketchup_selection),
+            mappingMethods: [
+              'Direct Shape'
+            ],
+            categories: Mapping::Category::RevitCategory.to_a
+          }
+          selection = { selection: [], mappingMethods: [], categories: [] } if sketchup_selection.none?
+
+          state.with_selection_queue(selection)
+        end
+      end
+    end
+  end
+end

speckle_connector/src/actions/hide_mappings_from_table.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative 'events/selection_event_action'
+require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Hide entities that selected from mapped elements table.
+    class HideMappingsFromTable < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state, data)
+        # Flat entities to clear mappings
+        flat_entities = SketchupModel::Query::Entity.flat_entities(state.sketchup_state.sketchup_model.entities)
+
+        # Collect entity ids to clear mappings
+        entity_ids = data.collect { |_, entities| entities['selectedElements'].collect { |e| e['entityId'] } }.flatten
+
+        # Store speckle state to update with mapped entities.
+        flat_entities.each do |entity|
+          next unless entity_ids.include?(entity.persistent_id)
+
+          if entity.is_a?(Sketchup::ComponentDefinition)
+            entity.instances.each do |instance|
+              instance.hidden = true
+            end
+          end
+          entity.hidden = true
+        end
+
+        Events::SelectionEventAction.update_state(state, { clear: true })
+      end
+    end
+  end
+end

speckle_connector/src/actions/initialize_speckle.rb

@@ -23,6 +23,7 @@ module SpeckleConnector
         preferences = Preferences.read_preferences(sketchup_state.sketchup_model)
         user_state_with_preferences = state.user_state.with_preferences(preferences)
         state = States::State.new(user_state_with_preferences, speckle_state, sketchup_state, false)
+        # This is where we attach observers to related model objects like selection, entities..
         Actions::LoadSketchupModel.update_state(state, sketchup_state.sketchup_model)
       end
 

speckle_connector/src/actions/isolate_mappings_from_table.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative 'events/selection_event_action'
+require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Isolate entities that selected from mapped elements table.
+    class IsolateMappingsFromTable < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def self.update_state(state, data)
+        sketchup_model = state.sketchup_state.sketchup_model
+
+        # Hide all entities first
+        sketchup_model.entities.each do |ent|
+          ent.hidden = true
+        end
+
+        # Flat entities to isolate mappings
+        flat_entities = SketchupModel::Query::Entity.flat_entities(sketchup_model.entities)
+
+        comp_flat_entities = flat_entities.grep(Sketchup::ComponentInstance) + flat_entities.grep(Sketchup::Group) +
+                             flat_entities.grep(Sketchup::ComponentDefinition)
+        face_edge_flat_entities = flat_entities.grep(Sketchup::Face) + flat_entities.grep(Sketchup::Edge)
+
+        # Collect entity ids to clear mappings
+        selected_elements = data.collect { |_, entities| entities['selectedElements'] }.flatten
+
+        comps_or_groups, faces_or_edges = selected_elements.partition do |e|
+          e['entityType'] == 'Component' || e['entityType'] == 'Definition' || e['entityType'] == 'Group'
+        end
+
+        faces_or_edges_ids = faces_or_edges.collect { |e| e['entityId'] }
+
+        face_edge_flat_entities.select { |e| faces_or_edges_ids.include?(e.persistent_id) }.each do |entity|
+          entity.hidden = false
+        end
+
+        comps_or_groups_ids = comps_or_groups.collect { |e| e['entityId'] }
+
+        comp_flat_entities.select { |e| comps_or_groups_ids.include?(e.persistent_id) }.each do |entity|
+          if entity.is_a?(Sketchup::ComponentDefinition)
+            entity.instances.each do |instance|
+              instance.hidden = false
+            end
+          end
+          entity.hidden = false
+        end
+
+        Events::SelectionEventAction.update_state(state, { clear: true })
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
+    end
+  end
+end

speckle_connector/src/actions/load_sketchup_model.rb

@@ -28,6 +28,9 @@ module SpeckleConnector
         # Read speckle entities
         new_speckle_entities = SketchupModel::Reader::SpeckleEntitiesReader.read(sketchup_model.entities)
         new_speckle_state = new_state.speckle_state.with_speckle_entities(Immutable::Hash.new(new_speckle_entities))
+        # Read mapped entities
+        new_mapped_entities = SketchupModel::Reader::SpeckleEntitiesReader.read_mapped_entities(sketchup_model.entities)
+        new_speckle_state = new_speckle_state.with_mapped_entities(Immutable::Hash.new(new_mapped_entities))
         new_state = new_state.with_speckle_state(new_speckle_state)
 
         # Read preferences from database and model.
@@ -42,8 +45,8 @@ module SpeckleConnector
       # @param sketchup_model [Sketchup::Model] the model to attach observers to
       # @param observers [Hash{Class=>}] the observer objects indexed by their class that will be attached
       def self.attach_observers(sketchup_model, observers)
-        # selection = sketchup_model.selection
-        # selection.add_observer(observers[SELECTION_OBSERVER_NAME])
+        selection = sketchup_model.selection
+        selection.add_observer(observers[SELECTION_OBSERVER])
         # layers = sketchup_model.layers
         # layers.add_observer(observers[LAYERS_OBSERVER_NAME])
         entities = sketchup_model.entities

speckle_connector/src/actions/mapped_entities_updated.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative '../sketchup_model/reader/speckle_entities_reader'
+
+module SpeckleConnector
+  module Actions
+    # Triggers when mapped entities updated.
+    class MappedEntitiesUpdated < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state, _data = nil)
+        mapped_entities = SketchupModel::Reader::SpeckleEntitiesReader
+                          .mapped_entity_details(state.speckle_state.mapped_entities.values.to_a)
+
+        state.with_mapped_entities_queue(mapped_entities)
+      end
+    end
+  end
+end

speckle_connector/src/actions/on_events_action.rb

@@ -4,6 +4,7 @@ require_relative 'action'
 require_relative 'events/app_event_action'
 require_relative 'events/entities_event_action'
 require_relative 'events/model_event_action'
+require_relative 'events/selection_event_action'
 require_relative '../constants/observer_constants'
 
 module SpeckleConnector
@@ -13,11 +14,11 @@ module SpeckleConnector
       RUN_ORDER = {
         APP_OBSERVER => Events::AppEventAction,
         ENTITIES_OBSERVER => Events::EntitiesEventAction,
-        MODEL_OBSERVER => Events::ModelEventAction
+        MODEL_OBSERVER => Events::ModelEventAction,
         # MATERIALS_OBSERVER => Events::MaterialsEventAction,
         # LAYERS_OBSERVER => Events::LayerEventAction,
         # PAGES_OBSERVER => Events::PagesEventAction,
-        # SELECTION_OBSERVER => Events::SelectionEventAction
+        SELECTION_OBSERVER => Events::SelectionEventAction
       }.freeze
 
       def self.update_state(state, events)

speckle_connector/src/actions/select_mappings_from_table.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative 'events/selection_event_action'
+require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Select entities that selected from mapped elements table.
+    class SelectMappingsFromTable < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state, data)
+        # Clear first selection
+        state.sketchup_state.sketchup_model.selection.clear
+
+        # Flat entities to clear mappings
+        flat_entities = SketchupModel::Query::Entity.flat_entities(state.sketchup_state.sketchup_model.entities)
+
+        # Collect entity ids to clear mappings
+        entity_ids = data.collect { |_, entities| entities['selectedElements'].collect { |e| e['entityId'] } }.flatten
+
+        # Store speckle state to update with mapped entities.
+        flat_entities.each do |entity|
+          next unless entity_ids.include?(entity.persistent_id)
+
+          if entity.is_a?(Sketchup::ComponentDefinition)
+            state.sketchup_state.sketchup_model.selection.add(entity.instances)
+          end
+          state.sketchup_state.sketchup_model.selection.add(entity)
+        end
+
+        Events::SelectionEventAction.update_state(state, { clear: true })
+      end
+    end
+  end
+end

speckle_connector/src/actions/show_all_entities.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+
+module SpeckleConnector
+  module Actions
+    # Show all entities on the model.
+    class ShowAllEntities < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state, _data)
+        # Show all entities first
+        state.sketchup_state.sketchup_model.entities.each do |ent|
+          ent.hidden = false
+        end
+        state
+      end
+    end
+  end
+end

speckle_connector/src/app/speckle_connector_app.rb

@@ -32,16 +32,20 @@ module SpeckleConnector
         ui_controller.update_ui(state)
       end
 
+      # Attach observers to application when speckle initialized via menu commands.
+      def add_observer_handler!(observer_handler)
+        @observer_handler = observer_handler
+      end
+
+      # Send messages to HtmlDialog if any.
       def send_messages!
         queue = @state.speckle_state.message_queue
         queue.each_value { |value| ui_controller.user_interfaces[Ui::SPECKLE_UI_ID].dialog.execute_script(value) }
         update_state!(Actions::ClearQueue)
       end
 
-      def add_observer_handler!(observer_handler)
-        @observer_handler = observer_handler
-      end
-
+      # This is the only function application state will be switched by calling upcoming action with it's parameters
+      #  if any.
       def update_state!(action, *parameters)
         old_state = @state
         @state = action.update_state(old_state, *parameters)

speckle_connector/src/commands/apply_mappings.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'command'
+require_relative '../actions/apply_mappings'
+
+module SpeckleConnector
+  module Commands
+    # Command to apply mapping for selected entities.
+    class ApplyMappings < Command
+      def _run(data)
+        entities_to_map = data['entitiesToMap']
+        method = data['method']
+        category = data['category']
+        name = data['name']
+        is_definition = data['isDefinition']
+        action = Actions::ApplyMappings.new(entities_to_map, method, category, name, is_definition)
+        app.update_state!(action)
+      end
+    end
+  end
+end

speckle_connector/src/commands/clear_mappings.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative 'command'
+require_relative '../actions/clear_mappings'
+
+module SpeckleConnector
+  module Commands
+    # Command to clear mapping for selected entities.
+    class ClearMappings < Command
+      def _run(data)
+        entities_to_map = data['entitiesToClearMap']
+        is_definition = data['isDefinition']
+        action = Actions::ClearMappings.new(entities_to_map, is_definition)
+        app.update_state!(action)
+      end
+    end
+  end
+end

speckle_connector/src/constants/dict_constants.rb

@@ -2,6 +2,9 @@
 
 module SpeckleConnector
   SPECKLE_BASE_OBJECT = 'Speckle_Base_Object'
+  SPECKLE_MAPPING_TOOL_SCHEMA = 'Speckle_Mapping_Tool_Schema'
+  SPECKLE_SCHEMA = 'Speckle_Schema'
+
   SPECKLE_ID = 'speckle_id'
   SPECKLE_TYPE = 'speckle_type'
   APPLICATION_ID = 'application_id'

speckle_connector/src/constants/observer_constants.rb

@@ -4,4 +4,5 @@ module SpeckleConnector
   APP_OBSERVER = 'SpeckleConnector::Observers::AppObserver'
   ENTITIES_OBSERVER = 'SpeckleConnector::Observers::EntitiesObserver'
   MODEL_OBSERVER = 'SpeckleConnector::Observers::ModelObserver'
+  SELECTION_OBSERVER = 'SpeckleConnector::Observers::SelectionObserver'
 end

speckle_connector/src/constants/pref_constants.rb

@@ -11,6 +11,13 @@ module SpeckleConnector
   INCLUDE_COMPONENT_ENTITY_ATTRIBUTES = :include_component_entity_attributes
   MERGE_COPLANAR_FACES = :merge_coplanar_faces
 
+  ENTITY_KEYS_FOR_INCLUDING_ATTRIBUTES = {
+    Sketchup::ComponentInstance => INCLUDE_COMPONENT_ENTITY_ATTRIBUTES,
+    Sketchup::Group => INCLUDE_GROUP_ENTITY_ATTRIBUTES,
+    Sketchup::Face => INCLUDE_FACE_ENTITY_ATTRIBUTES,
+    Sketchup::Face => INCLUDE_EDGE_ENTITY_ATTRIBUTES
+  }.freeze
+
   LEVEL_SHIFT_VALUE = SpeckleObjects::Geometry.length_to_native(1.5, 'm')
 
   DEFAULT_MODEL_PREFERENCES = {

speckle_connector/src/constants/type_constants.rb

@@ -3,7 +3,12 @@
 module SpeckleConnector
   BASE_OBJECT = 'Base'
 
+  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'
 
   OBJECTS_GEOMETRY_LINE = 'Objects.Geometry.Line'
   OBJECTS_GEOMETRY_POLYLINE = 'Objects.Geometry.Polyline'
@@ -16,4 +21,7 @@ module SpeckleConnector
   OBJECTS_OTHER_REVIT_REVITINSTANCE = 'Objects.Other.Revit.RevitInstance'
   OBJECTS_OTHER_BLOCKDEFINITION = 'Objects.Other.BlockDefinition'
   OBJECTS_OTHER_RENDERMATERIAL = 'Objects.Other.RenderMaterial'
+  OBJECTS_OTHER_DISPLAYSTYLE = 'Objects.Other.DisplayStyle'
+
+  SPECKLE_CORE_MODELS_COLLECTION = 'Speckle.Core.Models.Collection'
 end

speckle_connector/src/convertors/base_object_serializer.rb

@@ -228,6 +228,8 @@ module SpeckleConnector
 
         return false unless is_array && value.length == 2
 
+        return false if value[1].nil?
+
         value[1].all? { |v| v.is_a?(Sketchup::Entity) }
       end
 

speckle_connector/src/convertors/to_native.rb

@@ -2,16 +2,20 @@
 
 require_relative 'converter'
 require_relative '../constants/type_constants'
+require_relative '../speckle_objects/gis/polygon_element'
 require_relative '../speckle_objects/other/transform'
 require_relative '../speckle_objects/other/render_material'
 require_relative '../speckle_objects/other/block_definition'
 require_relative '../speckle_objects/other/block_instance'
 require_relative '../speckle_objects/other/display_value'
-require_relative '../speckle_objects/other/revit/revit_instance'
+require_relative '../speckle_objects/revit/revit_instance'
 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'
 
 module SpeckleConnector
   module Converters
@@ -34,6 +38,9 @@ module SpeckleConnector
       # Module aliases
       GEOMETRY = SpeckleObjects::Geometry
       OTHER = SpeckleObjects::Other
+      REVIT = SpeckleObjects::Revit
+      BUILTELEMENTS = SpeckleObjects::BuiltElements
+      GIS = SpeckleObjects::GIS
 
       # Class aliases
       POINT = GEOMETRY::Point
@@ -41,9 +48,12 @@ module SpeckleConnector
       MESH = GEOMETRY::Mesh
       BLOCK_DEFINITION = OTHER::BlockDefinition
       BLOCK_INSTANCE = OTHER::BlockInstance
-      REVIT_INSTANCE = OTHER::Revit::RevitInstance
+      REVIT_INSTANCE = REVIT::Other::RevitInstance
       RENDER_MATERIAL = OTHER::RenderMaterial
       DISPLAY_VALUE = OTHER::DisplayValue
+      VIEW3D = BUILTELEMENTS::View3d
+      POLYGON_ELEMENT = GIS::PolygonElement
+      COLLECTION = SpeckleObjects::Speckle::Core::Models::Collection
 
       BASE_OBJECT_PROPS = %w[applicationId id speckle_type totalChildrenCount].freeze
       CONVERTABLE_SPECKLE_TYPES = %w[
@@ -56,6 +66,10 @@ module SpeckleConnector
         Objects.Other.BlockDefinition
         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
 
       def from_revit
@@ -66,6 +80,10 @@ module SpeckleConnector
         @from_sketchup ||= source_app.include?('sketchup')
       end
 
+      def from_qgis
+        @from_qgis ||= source_app.include?('qgis')
+      end
+
       # ReceiveObjects action call this method by giving everything that comes from server.
       # Upcoming object is a referencedObject of selected commit to receive.
       # UI is responsible currently to fetch objects from ObjectLoader module by calling getAndConstruct method.
@@ -73,27 +91,64 @@ module SpeckleConnector
       def receive_commit_object(obj)
         # First create layers on the sketchup before starting traversing
         # @Named Views are exception here. It does not mean a layer. But it is anti-pattern for now.
-        filtered_layer_containers = obj.keys.filter_map { |key| key if key.start_with?('@') && key != '@Named Views' }
-        create_layers(filtered_layer_containers, sketchup_model.layers) unless from_revit
-        # Convert views to sketchup scenes
-        SpeckleObjects::BuiltElements::View3d.to_native(obj, sketchup_model)
-        # Get default commit layer from sketchup model which will be used as fallback
+        # layers_relation = obj['layers_relation']
+
+        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
+
+        # Navigate to branch entities if commit doesn't come from sketchup
+        unless from_sketchup
+          @branch_definition = branch_definition
+          @entities_to_fill = @branch_definition.entities
+        end
+
         default_commit_layer = sketchup_model.layers.layers.find { |layer| layer.display_name == '@Untagged' }
-        @entities_to_fill = entities_to_fill(obj)
-        traverse_commit_object(obj, sketchup_model.layers, default_commit_layer, @entities_to_fill)
+
+        traverse_commit_object(obj, default_commit_layer, @entities_to_fill)
         create_levels_from_section_planes
         check_hiding_layers_needed
+        try_create_instance
         @state
       end
 
+      # Creating instance from @branch_definition only available for non-sketchup commits since we wrap commits
+      # under instance.
+      # There is also another use case that maybe definition is exist in file but user might be deleted it before.
+      # If this is the case we can add instance by checking number of instances.
+      # rubocop:disable Style/GuardClause
+      def try_create_instance
+        if !from_sketchup && (!@is_update_commit || @branch_definition.instances.empty?)
+          instance = sketchup_model.entities.add_instance(@branch_definition, Geom::Transformation.new)
+          BLOCK_INSTANCE.align_instance_axes(instance) if from_qgis
+        end
+      end
+      # rubocop:enable Style/GuardClause
+
       def levels_layer
         @levels_layer ||= sketchup_model.layers.add('Levels')
       end
 
+      def clear_levels
+        instances = @entities_to_fill.grep(Sketchup::ComponentInstance)
+        instances.each do |instance|
+          speckle_type = instance.get_attribute(SPECKLE_BASE_OBJECT, 'speckle_type')
+          next if speckle_type.nil?
+
+          sketchup_model.definitions.remove(instance.definition) if speckle_type == OBJECTS_BUILTELEMENTS_REVIT_LEVEL
+        end
+      end
+
       # Create levels from section planes that already created for this commit object.
       # rubocop:disable Metrics/AbcSize
       # rubocop:disable Metrics/MethodLength
       def create_levels_from_section_planes
+        clear_levels if @is_update_commit
         return unless from_revit
 
         section_planes = @entities_to_fill.grep(Sketchup::SectionPlane)
@@ -105,7 +160,9 @@ module SpeckleConnector
         section_planes.each do |section_plane|
           level_name = "#{@definition_name}-#{section_plane.name}"
           definition = sketchup_model.definitions.add(level_name)
-          @entities_to_fill.add_instance(definition, Geom::Transformation.new)
+          instance = @entities_to_fill.add_instance(definition, Geom::Transformation.new)
+          att = section_plane.attribute_dictionary(SPECKLE_BASE_OBJECT).to_h
+          SketchupModel::Dictionary::SpeckleEntityDictionaryHandler.set_hash(instance, att)
           elevation = section_plane.bounds.center.z
           c1_e = Geom::Point3d.new(c_1.x, c_1.y, elevation - LEVEL_SHIFT_VALUE)
           c2_e = Geom::Point3d.new(c_2.x, c_2.y, elevation - LEVEL_SHIFT_VALUE)
@@ -122,8 +179,17 @@ module SpeckleConnector
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength
 
+      # @return [Sketchup::ComponentDefinition] branch definition to fill objects in it.
+      def branch_definition
+        @definition_name = "#{@branch_name}-#{@stream_name}"
+        definition = sketchup_model.definitions.find { |d| d.name == @definition_name }
+        @is_update_commit = !definition.nil?
+        definition = sketchup_model.definitions.add(@definition_name) if definition.nil?
+        definition
+      end
+
       def entities_to_fill(_obj)
-        return sketchup_model.entities if from_sketchup
+        return sketchup_model.entities unless from_revit
 
         @definition_name = "#{@branch_name}-#{@stream_name}"
         definition = sketchup_model.definitions.find { |d| d.name == @definition_name }
@@ -131,7 +197,7 @@ module SpeckleConnector
           definition = sketchup_model.definitions.add(@definition_name)
           sketchup_model.entities.add_instance(definition, Geom::Transformation.new)
         end
-        definition.entities
+        definition
       end
 
       LAYERS_WILL_BE_HIDDEN = [
@@ -169,80 +235,12 @@ module SpeckleConnector
         ['Objects.BuiltElements.Revit.Parameter'].include?(obj['speckle_type'])
       end
 
-      # Create actual Sketchup layers from layer_paths that taken from Speckle base object.
-      # @param layer_paths [Array<String>] layer paths to decompose it to folders and it's layers.
-      # @param folder [Sketchup::Layers, Sketchup::LayerFolder] folder to create folders and layers under it.
-      def create_layers(layer_paths, folder)
-        # Strip leading '@'
-        layers_with_folders = layer_paths.map { |layer| layer[1..-1] }
-        # Split layer_paths according to having parent folder or not.
-        layers_with_head_folder, headless_layers = layers_with_folders.partition { |layer| layer.include?('::') }
-        # Create array of array that split with '::'
-        folder_layer_arrays = layers_with_head_folder.collect { |folder_layer| folder_layer.split('::') }
-        # Add headless layers into `Sketchup.active_model.layers`
-        create_headless_layers(headless_layers, folder)
-        # Create layers that have parent folder(s)- this method is recursive until all tree is created.
-        create_folder_layers(folder_layer_arrays, folder)
-      end
-
-      # @param page [Sketchup::Page] scene to update -update properties-
-      def set_page_update_properties(page, update_properties)
-        update_properties.each do |prop, value|
-          page.instance_variable_set(:"@#{prop}", value)
-        end
-      end
-
-      # @param rendering_options [Sketchup::RenderingOptions] rendering options of scene (page)
-      def set_rendering_options(rendering_options, speckle_rendering_options)
-        speckle_rendering_options.each do |prop, value|
-          next if rendering_options[prop].nil?
-
-          rendering_options[prop] = if value.is_a?(Hash)
-                                      SpeckleObjects::Others::Color.to_native(value)
-                                    else
-                                      value
-                                    end
-        end
-      end
-
-      # @param headless_layers [Array<String>] headless layer names.
-      # @param folder [Sketchup::Layers, Sketchup::LayerFolder] layer folder to create commit layers under it.
-      def create_headless_layers(headless_layers, folder)
-        headless_layers.each do |layer_name|
-          # Add layer first to the layers object of sketchup model.
-          layer = sketchup_model.layers.add(layer_name)
-          folder.add_layer(layer) unless folder.layers.any? { |l| l.display_name == layer_name }
-        end
-      end
-
-      # Create layers with it's parent folders.
-      # @param folder [Sketchup::LayerFolder] layer folder to create commit layers under it.
-      def create_folder_layers(folder_layer_arrays, folder)
-        folder_layer_arrays.each do |folder_layer_array|
-          create_folder_layer(folder_layer_array, folder)
-        end
-      end
-
-      # Create layers that have parent folder(s)- this method is recursive (self-caller) until all tree is created.
-      def create_folder_layer(folder_array, folder)
-        if folder_array.length > 1
-          # add folder if it is not exist.
-          folder.add_folder(folder_array[0]) unless folder.folders.any? { |f| f.display_name == folder_array[0] }
-          new_folder = folder.folders.find { |f| f.display_name == folder_array[0] }
-          create_folder_layer(folder_array[1..-1], new_folder)
-        else
-          # Add layer first to the layers object of sketchup model.
-          layer = sketchup_model.layers.add(folder_array[0])
-          folder.add_layer(layer) unless folder.layers.any? { |l| l.display_name == layer }
-        end
-      end
-
       # Traversal method to create Sketchup objects from upcoming base object.
       # @param obj [Hash, Array] object might be source base object or it's sub objects, because this method is a
       #   self-caller method means that call itself according to conditions inside of it.
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
-      def traverse_commit_object(obj, commit_folder, layer, entities)
+      def traverse_commit_object(obj, layer, entities)
         if convertible_to_native?(obj)
           @state = convert_to_native(@state, obj, layer, entities)
         elsif obj.is_a?(Hash) && obj.key?('speckle_type')
@@ -252,57 +250,23 @@ module SpeckleConnector
             # puts(">>> Found #{obj['speckle_type']}: #{obj['id']}. Continuing traversal.")
             props = obj.keys.filter_map { |key| key unless key.start_with?('_') }
             props.each do |prop|
-              layer_path = prop if prop.start_with?('@') && obj[prop].is_a?(Array)
-              layer = find_layer(layer_path, commit_folder, layer)
-              traverse_commit_object(obj[prop], commit_folder, layer, entities)
+              traverse_commit_object(obj[prop], layer, entities)
             end
           else
             # puts(">>> Found #{obj['speckle_type']}: #{obj['id']} with displayValue.")
             @state = convert_to_native(@state, obj, layer, entities)
           end
         elsif obj.is_a?(Hash)
-          obj.each_value { |value| traverse_commit_object(value, commit_folder, layer, entities) }
+          obj.each_value { |value| traverse_commit_object(value, layer, entities) }
         elsif obj.is_a?(Array)
-          obj.each { |value| traverse_commit_object(value, commit_folder, layer, entities) }
+          obj.each { |value| traverse_commit_object(value, layer, entities) }
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
 
-      # Find layer of the Speckle object by checking iteratively into folder.
-      # @param layer_path [String] complete layer_path to retrieve
-      # @param folder [Sketchup::LayerFolder, Sketchup::Layers] entry folder to search layer
-      # @param fallback_layer [Sketchup::Layer] fallback layer to assign object later if any error occur.
-      # @return [Sketchup::Layer] layer according to path
-      # @example
-      #   "@folder_1::folder_2::layer_1"
-      #   # it will return the layer object which has display name as `layer_1`.
-      def find_layer(layer_path, folder, fallback_layer)
-        begin
-          # Split folders and it's tail layer (last one is layer, others are folders.)
-          layer_path_array = layer_path[1..-1].split('::')
-          # Get sub folders as array, might be empty if `layer_path_array` has only 1 entry
-          sub_folders = layer_path_array.length > 1 ? layer_path_array[0..-2] : []
-          # Get exact layer name from last entry
-          layer_name = layer_path_array.last
-          # Iterate sub folders to find new sub folder to switch it.
-          # It help to search in the tree by switching the target search folder.
-          # Finally we can reach the layer name.
-          sub_folders.each do |sub_folder|
-            # Try to find sub folder into source folder passes by argument
-            s_f = folder.folders.find { |f| f.display_name == sub_folder }
-            # Switch source folder if any exist
-            folder = s_f unless s_f.nil?
-          end
-          # Find finally the layer into related folder
-          folder.layers.find { |l| l.display_name == layer_name }
-        rescue StandardError
-          return fallback_layer
-        end
-      end
-
       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
@@ -316,7 +280,12 @@ module SpeckleConnector
         OBJECTS_OTHER_BLOCKINSTANCE => BLOCK_INSTANCE.method(:to_native),
         OBJECTS_OTHER_BLOCKINSTANCE_FULL => BLOCK_INSTANCE.method(:to_native),
         OBJECTS_OTHER_REVIT_REVITINSTANCE => REVIT_INSTANCE.method(:to_native),
-        OBJECTS_OTHER_RENDERMATERIAL => RENDER_MATERIAL.method(:to_native)
+        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
 
       # @param state [States::State] state of the speckle application
@@ -349,13 +318,13 @@ module SpeckleConnector
 
         layer = sketchup_model.layers.find { |l| l.display_name == speckle_object['category'] }
         unless layer.nil?
-          entities.each { |entity| entity.layer = layer } if layer
+          entities.each { |entity| entity.layer = layer if entity.respond_to?(:layer) } if layer
           return state
         end
 
         layer = sketchup_model.layers.add(speckle_object['category'])
         unless layer.nil?
-          entities.each { |entity| entity.layer = layer } if layer
+          entities.each { |entity| entity.layer = layer if entity.respond_to?(:layer) } if layer
           state
         end
         state
@@ -365,30 +334,37 @@ module SpeckleConnector
 
       # @param state [States::State] state of the speckle application
       def create_levels(state, speckle_object)
-        return state if speckle_object['level'].nil?
-        return state unless speckle_object['level']['speckle_type'].include?('Objects.BuiltElements.Level')
+        level = speckle_object['level']
+        return state if level.nil?
+        return state unless level['speckle_type'].include?('Objects.BuiltElements.Level')
 
-        level_name = speckle_object['level']['name'] || speckle_object['level']['id']
+        level_name = level['name'] || level['id']
         is_exist = @entities_to_fill.grep(Sketchup::SectionPlane).any? { |sp| sp.name == level_name }
         return state if is_exist
 
-        elevation = SpeckleObjects::Geometry.length_to_native(speckle_object['level']['elevation'],
-                                                              speckle_object['level']['units'])
+        elevation = SpeckleObjects::Geometry.length_to_native(level['elevation'], level['units'])
 
         section_plane = @entities_to_fill.add_section_plane([0, 0, elevation + LEVEL_SHIFT_VALUE], [0, 0, -1])
         section_plane.name = level_name
+        SketchupModel::Dictionary::SpeckleEntityDictionaryHandler.write_initial_base_data(
+          section_plane, level['applicationId'], level['id'], level['speckle_type'], [], @stream_id
+        )
         state
       end
 
       # @param state [States::State] state of the application
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
       def convert_to_speckle_entities(state, speckle_object, entities)
+        return state if entities.empty?
+
         speckle_id = speckle_object['id']
         application_id = speckle_object['applicationId']
         speckle_type = speckle_object['speckle_type']
         children = speckle_object['__closure'].nil? ? [] : speckle_object['__closure']
         speckle_state = state.speckle_state
         entities.each do |entity|
-          next if entity.is_a?(Sketchup::Material)
+          next if entity.is_a?(Sketchup::Material) || entity.is_a?(Sketchup::Page)
           next if (entity.is_a?(Sketchup::Face) || entity.is_a?(Sketchup::Edge)) &&
                   !state.user_state.user_preferences[:register_speckle_entity]
 
@@ -399,6 +375,8 @@ module SpeckleConnector
         end
         state.with_speckle_state(speckle_state)
       end
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
     # rubocop:enable Metrics/ClassLength
   end

speckle_connector/src/convertors/to_speckle.rb

@@ -10,63 +10,30 @@ require_relative '../speckle_objects/other/block_instance'
 require_relative '../speckle_objects/other/block_definition'
 require_relative '../speckle_objects/other/rendering_options'
 require_relative '../speckle_objects/built_elements/view3d'
+require_relative '../speckle_objects/built_elements/revit/direct_shape'
+require_relative '../speckle_objects/relations/layers'
+require_relative '../speckle_objects/speckle/core/models/model_collection'
 require_relative '../constants/path_constants'
+require_relative '../sketchup_model/reader/speckle_entities_reader'
+require_relative '../sketchup_model/query/entity'
 
 module SpeckleConnector
   module Converters
     # Converts sketchup entities to speckle objects.
     class ToSpeckle < Converter
+      MODEL_COLLECTION = SpeckleObjects::Speckle::Core::Models::ModelCollection
+      DIRECT_SHAPE = SpeckleObjects::BuiltElements::Revit::DirectShape
+      SPECKLE_ENTITIES_READER = SketchupModel::Reader::SpeckleEntitiesReader
+      VIEW3D = SpeckleObjects::BuiltElements::View3d
+
       # Convert selected objects by putting them into related array that grouped by layer.
       # @return [Hash{Symbol=>Array}] layers -which only have objects- to hold it's objects under the base object.
       def convert_selection_to_base(preferences)
-        layers = add_all_layers
-        state = speckle_state
-        sketchup_model.selection.each do |entity|
-          new_speckle_state, converted_object_with_entity = convert(entity, preferences, state)
-          state = new_speckle_state
-          layer_name = entity_layer_path(entity)
-          layers[layer_name].push(converted_object_with_entity)
-        end
-        # send only+ layers that have any object
-        base_object_properties = layers.reject { |_layer_name, objects| objects.empty? }
-        add_views(base_object_properties) if sketchup_model.pages.any?
-        return state, SpeckleObjects::Base.with_detached_layers(base_object_properties)
-      end
+        convert = method(:convert)
+        new_speckle_state, model_collection = MODEL_COLLECTION.from_sketchup_model(sketchup_model, speckle_state,
+                                                                                   @units, preferences, &convert)
 
-      # Add views from pages.
-      # @param base_object_properties [Hash] dynamically attached base object properties.
-      def add_views(base_object_properties)
-        views = []
-        sketchup_model.pages.each do |page|
-          cam = page.camera
-          origin = get_camera_origin(cam)
-          target = get_camera_target(cam)
-          direction = get_camera_direction(cam)
-          update_properties = get_scene_update_properties(page)
-          rendering_options = SpeckleObjects::Others::RenderingOptions.to_speckle(page.rendering_options)
-          view = SpeckleObjects::BuiltElements::View3d.new(
-            page.name, origin, target, direction, SpeckleObjects::Geometry::Vector.new(0, 0, 1, @units),
-            cam.perspective?, cam.fov, @units, page.name, update_properties, rendering_options
-          )
-          views.append(view)
-        end
-        base_object_properties['@Named Views'] = views
-      end
-
-      # Get scene properties
-      # @param page [Sketchup::Page] page on sketchup.
-      def get_scene_update_properties(page)
-        {
-          use_axes: page.use_axes?,
-          use_camera: page.use_camera?,
-          use_hidden_geometry: page.use_hidden_geometry?,
-          use_hidden_layers: page.use_hidden_layers?,
-          use_hidden_objects: page.use_hidden_objects?,
-          use_rendering_options: page.use_rendering_options?,
-          use_section_planes: page.use_section_planes?,
-          use_shadow_info: page.use_shadow_info?,
-          use_style: page.use_style?
-        }
+        return new_speckle_state, model_collection
       end
 
       # Serialized and traversed information to send batches.
@@ -93,17 +60,32 @@ module SpeckleConnector
       # @param entity [Sketchup::Entity] sketchup entity to convert Speckle.
       # @param speckle_state [States::SpeckleState] the current speckle state of the {States::State}
       # @param parent [Symbol, String] parent of the Sketchup Entity to be converted.
-      # rubocop:disable Metrics/MethodLength
       def convert(entity, preferences, speckle_state, parent = :base)
         convert = method(:convert)
 
+        unless SketchupModel::Reader::SpeckleEntitiesReader.mapped_with_schema?(entity)
+          return from_native_to_speckle(entity, preferences, speckle_state, parent, &convert)
+        end
+
+        return speckle_state, nil
+      end
+
+      def from_mapped_to_speckle(entity, path, preferences)
+        direct_shape = SpeckleObjects::BuiltElements::Revit::DirectShape
+                       .from_entity(entity, path, @units, preferences)
+        return [direct_shape, [entity]]
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def from_native_to_speckle(entity, preferences, speckle_state, parent, &convert)
         if entity.is_a?(Sketchup::Edge)
           line = SpeckleObjects::Geometry::Line.from_edge(entity, @units, preferences[:model]).to_h
           return speckle_state, [line, [entity]]
         end
 
         if entity.is_a?(Sketchup::Face)
-          mesh = SpeckleObjects::Geometry::Mesh.from_face(entity, @units, preferences[:model])
+          mesh = SpeckleObjects::Geometry::Mesh.from_face(face: entity, units: @units,
+                                                          model_preferences: preferences[:model])
           return speckle_state, [mesh, [entity]]
         end
 
@@ -124,9 +106,13 @@ module SpeckleConnector
         end
 
         if entity.is_a?(Sketchup::ComponentDefinition)
+          # Local caching
+          return speckle_state, [definitions[entity.guid], [entity]] if definitions.key?(entity.guid)
+
           new_speckle_state, block_definition = SpeckleObjects::Other::BlockDefinition.from_definition(
-            entity, @units, @definitions, preferences, speckle_state, parent, &convert
+            entity, @units, preferences, speckle_state, parent, &convert
           )
+          definitions[entity.guid] = block_definition
           speckle_state = new_speckle_state
           return speckle_state, [block_definition, [entity]]
         end
@@ -134,97 +120,6 @@ module SpeckleConnector
         return speckle_state, nil
       end
       # rubocop:enable Metrics/MethodLength
-
-      # Create layers -> {Hash{Symbol=>Array}} from sketchup model with empty array as hash entry values.
-      # This method add first headless layers (not belong to any folder),
-      # then goes through each folder, their sub-folders and their layers.
-      # @return [Hash{Symbol=>Array}] layers from sketchup model with empty array as hash entry values.
-      def add_all_layers
-        # add headless layers
-        layer_objects = add_layers(sketchup_model.layers.layers)
-        # add layers from folders
-        add_layers_from_folders(sketchup_model.layers.folders, layer_objects)
-        layer_objects
-      end
-
-      # @param layers [Array<Sketchup::Layer>] layers in sketchup model
-      # @return [Hash{Symbol=>Array}] layers with empty array value.
-      def add_layers(layers, layer_objects = {}, parent_name = '')
-        layers.each do |layer|
-          layer_name = parent_name.empty? ? "@#{layer.display_name}" : "#{parent_name}::#{layer.display_name}"
-          layer_objects[layer_name] = []
-        end
-        layer_objects
-      end
-
-      # @param folders [Array<Sketchup::LayerFolder>] layer folders in sketchup model.
-      # @param layer_objects [Hash{Symbol=>Array}] layer objects to fill in.
-      # @param parent_name [String] parent folder name to structure layer path before send to Speckle.
-      #  ex: "@#{parent_name}::#{layer_name}"
-      def add_layers_from_folders(folders, layer_objects, parent_name = '')
-        folders.each do |folder|
-          folder_name = parent_name.empty? ? "@#{folder.display_name}" : "#{parent_name}::#{folder.display_name}"
-          add_layers(folder.layers, layer_objects, folder_name)
-          add_layers_from_folders(folder.folders, layer_objects, folder_name) unless folder.folders.empty?
-        end
-      end
-
-      # Find layer path of given Sketchup entity.
-      # @param entity [Sketchup::Entity] entity to find root layer.
-      # @return [String] layer path of Sketchup entity.
-      def entity_layer_path(entity)
-        layer_name = entity.layer.display_name
-        if entity.layer.folder.nil?
-          "@#{layer_name}"
-        else
-          folders = folder_name(entity.layer.folder)
-          path = ''
-          folders.reverse.each do |folder|
-            path += "#{folder}::"
-          end
-          "@#{path}#{layer_name}"
-        end
-      end
-
-      # Nested method to retrieve sub-folders until nothing found.
-      # @return [Array<String>] folder names as list from bottom to top. Might need to be reversed if you want to see
-      #  from top to bottom.
-      def folder_name(folder, folders = [])
-        if folder.folder.nil?
-          folders.push(folder.display_name)
-        else
-          folder_name(folder.folder, folders.push(folder.display_name))
-        end
-      end
-
-      private
-
-      def get_camera_direction(cam)
-        SpeckleObjects::Geometry::Vector.new(
-          SpeckleObjects::Geometry.length_to_speckle(cam.direction[0], @units),
-          SpeckleObjects::Geometry.length_to_speckle(cam.direction[1], @units),
-          SpeckleObjects::Geometry.length_to_speckle(cam.direction[2], @units),
-          @units
-        )
-      end
-
-      def get_camera_target(cam)
-        SpeckleObjects::Geometry::Point.new(
-          SpeckleObjects::Geometry.length_to_speckle(cam.target[0], @units),
-          SpeckleObjects::Geometry.length_to_speckle(cam.target[1], @units),
-          SpeckleObjects::Geometry.length_to_speckle(cam.target[2], @units),
-          @units
-        )
-      end
-
-      def get_camera_origin(camera)
-        SpeckleObjects::Geometry::Point.new(
-          SpeckleObjects::Geometry.length_to_speckle(camera.eye[0], @units),
-          SpeckleObjects::Geometry.length_to_speckle(camera.eye[1], @units),
-          SpeckleObjects::Geometry.length_to_speckle(camera.eye[2], @units),
-          @units
-        )
-      end
     end
   end
 end

speckle_connector/src/mapping/category/revit_category.rb

@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  module Mapping
+    module Category
+      # Revit categories.
+      class RevitCategory < Hash
+        class << self
+          # rubocop:disable Metrics/MethodLength
+          def dictionary
+            {
+              AbutmentFoundations: 0,
+              AbutmentPiles: 1,
+              AbutmentWalls: 2,
+              BridgeAbutments: 3,
+              DuctTerminal: 4,
+              Alignments: 5,
+              StructConnectionAnchors: 6,
+              ApproachSlabs: 7,
+              BridgeArches: 8,
+              AudioVisualDevices: 9,
+              StairsRailingBaluster: 10,
+              BridgeBearings: 11,
+              StructConnectionBolts: 12,
+              BridgeCables: 13,
+              BridgeDecks: 14,
+              BridgeFraming: 15,
+              CableTrayFitting: 16,
+              CableTrayRun: 17,
+              CableTray: 18,
+              Casework: 19,
+              Ceilings: 20,
+              Columns: 21,
+              CommunicationDevices: 22,
+              ConduitFitting: 23,
+              Conduit: 24,
+              Coordination_Model: 25,
+              BridgeFramingCrossBracing: 26,
+              CurtainWallPanels: 27,
+              CurtaSystem: 28,
+              CurtainWallMullions: 29,
+              DataDevices: 30,
+              BridgeFramingDiaphragms: 31,
+              Doors: 32,
+              DuctAccessory: 33,
+              DuctFitting: 34,
+              PlaceHolderDucts: 35,
+              DuctSystem: 36,
+              DuctCurves: 37,
+              ElectricalEquipment: 38,
+              ElectricalFixtures: 39,
+              Entourage: 40,
+              ExpansionJoints: 41,
+              FireAlarmDevices: 42,
+              FireProtection: 43,
+              Floors: 44,
+              FoodServiceEquipment: 45,
+              Furniture: 46,
+              FurnitureSystems: 47,
+              GenericAnnotation: 48,
+              GenericModel: 49,
+              BridgeGirders: 50,
+              Hardscape: 51,
+              LightingDevices: 52,
+              LightingFixtures: 53,
+              Lines: 54,
+              Mass: 55,
+              MechanicalEquipment: 56,
+              MedicalEquipment: 57,
+              NurseCallDevices: 58,
+              Parking: 59,
+              Parts: 60,
+              PierCaps: 61,
+              PierColumns: 62,
+              BridgeFoundations: 63,
+              PierPiles: 64,
+              BridgeTowers: 65,
+              PierWalls: 66,
+              BridgePiers: 67,
+              PipeAccessory: 68,
+              PipeFitting: 69,
+              PlaceHolderPipes: 70,
+              PipeSegments: 71,
+              PipeCurves: 72,
+              PipingSystem: 73,
+              Planting: 74,
+              StructConnectionPlates: 75,
+              PlumbingFixtures: 76,
+              StructConnectionProfiles: 77,
+              StairsRailing: 78,
+              Ramps: 79,
+              Roads: 80,
+              Roofs: 81,
+              SecurityDevices: 82,
+              StructConnectionShearStuds: 83,
+              Signage: 84,
+              Site: 85,
+              SpecialityEquipment: 86,
+              Sprinklers: 87,
+              Stairs: 88,
+              StructuralFramingSystem: 89,
+              StructuralColumns: 90,
+              StructConnections: 91,
+              FabricAreas: 92,
+              StructuralFoundation: 93,
+              StructuralFraming: 94,
+              Rebar: 95,
+              Coupler: 96,
+              StructuralStiffener: 97,
+              StructuralTendons: 98,
+              StructuralTruss: 99,
+              TemporaryStructure: 100,
+              Topography: 101,
+              BridgeFramingTrusses: 102,
+              VerticalCirculation: 103,
+              VibrationDampers: 104,
+              VibrationIsolators: 105,
+              VibrationManagement: 106,
+              Walls: 107,
+              StructConnectionWelds: 108,
+              Windows: 109
+            }.freeze
+          end
+          # rubocop:enable Metrics/MethodLength
+
+          def reverse_dictionary
+            dictionary.collect { |k, v| [v, k] }.to_h
+          end
+
+          def to_a
+            dictionary.collect { |k, v| { key: k, value: v } }.to_a
+          end
+
+          def reverse_to_a
+            dictionary.collect { |k, v| { key: v, value: k } }.to_a
+          end
+        end
+      end
+    end
+  end
+end

speckle_connector/src/observers/factory.rb

@@ -5,6 +5,7 @@ require_relative 'entities_observer'
 require_relative 'observer_handler'
 require_relative 'model_observer'
 require_relative 'event_handler'
+require_relative 'selection_observer'
 require_relative '../constants/observer_constants'
 
 module SpeckleConnector
@@ -22,7 +23,8 @@ module SpeckleConnector
         {
           APP_OBSERVER => AppObserver.new(handler),
           ENTITIES_OBSERVER => EntitiesObserver.new(handler),
-          MODEL_OBSERVER => ModelObserver.new(handler)
+          MODEL_OBSERVER => ModelObserver.new(handler),
+          SELECTION_OBSERVER => SelectionObserver.new(handler)
         }.freeze
       end
     end

speckle_connector/src/observers/selection_observer.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative 'event_observer'
+
+module SpeckleConnector
+  module Observers
+    # @see https://ruby.sketchup.com/Sketchup/SelectionObserver.html
+    class SelectionObserver < Sketchup::SelectionObserver
+      include EventObserver
+
+      # rubocop:disable Naming/MethodName
+      # @param _selection (Sketchup::Selection)
+      # @param _entity (Sketchup::Entity)
+      def onSelectionAdded(_selection, _entity)
+        push_selection_event(:onSelectionAdded)
+      end
+
+      # @param _selection (Sketchup::Selection)
+      def onSelectionBulkChange(_selection)
+        push_selection_event(:onSelectionBulkChange)
+      end
+
+      # @param _selection (Sketchup::Selection)
+      def onSelectionCleared(_selection)
+        push_selection_event(:onSelectionCleared)
+      end
+
+      # @param _selection (Sketchup::Selection)
+      def onSelectionRemoved(_selection, _entity)
+        push_selection_event(:onSelectionRemoved)
+      end
+
+      # Due to a SketchUp bug, this method is called by the wrong name.
+      alias onSelectedRemoved onSelectionRemoved
+      # rubocop:enable Naming/MethodName
+
+      private
+
+      # Selection changes need to be registered only once
+      def push_selection_event(event_name)
+        # Don't push anything if the selection event was already registered
+        selection_events = observer_handler.events[self.class]
+        return if selection_events&.any?
+
+        push_event(event_name)
+      end
+    end
+  end
+end

speckle_connector/src/sketchup_model/dictionary/base_dictionary_handler.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'delegate'
+require_relative 'dictionary_handler'
+require_relative '../../constants/dict_constants'
+
+module SpeckleConnector
+  module SketchupModel
+    module Dictionary
+      # Read and write attributes for Speckle objects on SketchUp model.
+      class BaseDictionaryHandler < DictionaryHandler
+        IGNORED_DICTIONARY_NAMES = [
+          SPECKLE_BASE_OBJECT,
+          'IFC 4',
+          'IFC 2x3'
+        ].freeze
+
+        # @param entity [Sketchup::Entity] entity to get attribute dictionaries
+        def self.attribute_dictionaries_to_speckle(entity, model_preferences)
+          dictionaries = {}
+          return dictionaries unless model_preferences[INCLUDE_ENTITY_ATTRIBUTES]
+
+          klass = get_entity_setting_type(entity)
+          return dictionaries unless model_preferences[ENTITY_KEYS_FOR_INCLUDING_ATTRIBUTES[klass]]
+          return dictionaries if entity.attribute_dictionaries.nil?
+
+          entity.attribute_dictionaries.each do |att_dict|
+            dict_name = att_dict == '' ? 'empty_dictionary_name' : att_dict.name
+            dictionaries[dict_name] = att_dict.to_h unless IGNORED_DICTIONARY_NAMES.include?(att_dict.name)
+          end
+          dictionaries
+        end
+
+        # @param entity [Sketchup::Entity] entity to set attribute dictionaries
+        # rubocop:disable Metrics/CyclomaticComplexity
+        def self.attribute_dictionaries_to_native(entity, dictionaries)
+          return if dictionaries.nil?
+
+          classification_to_native(entity, dictionaries) if entity.is_a?(Sketchup::ComponentDefinition)
+
+          dictionaries.each do |dict_name, entries|
+            next unless entries.is_a?(Hash)
+
+            dict_name = dict_name == 'empty_dictionary_name' ? '' : dict_name
+            entries.each do |key, value|
+              set_attribute(entity, key, value, dict_name)
+            rescue StandardError => e
+              puts("Failed to write key: #{key} value: #{value} to dictionary #{dict_name}")
+              puts(e)
+            end
+          end
+        end
+        # rubocop:enable Metrics/CyclomaticComplexity
+
+        # Classification is ComponentDefinition specific, so they can be added only definition by add_classification
+        # method.
+        # @param definition_entity [Sketchup::ComponentDefinition] definition to add callback
+        def self.classification_to_native(definition_entity, dictionaries)
+          applied_schema_types = dictionaries['AppliedSchemaTypes']
+          return if applied_schema_types.nil?
+
+          applied_schema_types.each do |key, value|
+            definition_entity.add_classification(key, value)
+          end
+        end
+
+        # @return [String] the name of the dictionary to read from
+        def self.dictionary_name
+          SPECKLE_BASE_OBJECT
+        end
+
+        # Gets entity type for including entity attributes setting.
+        # @param entity [Sketchup::Entity] entity to find setting entity.
+        # @return [Sketchup::Face, Sketchup::Edge, Sketchup::Group, Sketchup::ComponentInstance]
+        def self.get_entity_setting_type(entity)
+          klass = entity.class
+          if entity.is_a?(Sketchup::ComponentDefinition)
+            klass = if entity.group?
+                      Sketchup::Group
+                    else
+                      Sketchup::ComponentInstance
+                    end
+          end
+          klass
+        end
+      end
+    end
+  end
+end

speckle_connector/src/sketchup_model/dictionary/dictionary_handler.rb

@@ -1,65 +1,13 @@
 # frozen_string_literal: true
 
 require 'delegate'
+require_relative '../../constants/dict_constants'
 
 module SpeckleConnector
   module SketchupModel
     module Dictionary
       # Read and write attributes from the groups and other entities that represents Speckle objects on SketchUp model.
       class DictionaryHandler
-        DICTIONARY_NAME = 'Speckle_Base_Object'
-
-        IGNORED_DICTIONARY_NAMES = [
-          DICTIONARY_NAME,
-          'IFC 4',
-          'IFC 2x3'
-        ].freeze
-
-        # @param entity [Sketchup::Entity] entity to get attribute dictionaries
-        def self.attribute_dictionaries_to_speckle(entity)
-          dictionaries = {}
-          return dictionaries if entity.attribute_dictionaries.nil?
-
-          entity.attribute_dictionaries.each do |att_dict|
-            dict_name = att_dict == '' ? 'empty_dictionary_name' : att_dict.name
-            dictionaries[dict_name] = att_dict.to_h unless IGNORED_DICTIONARY_NAMES.include?(att_dict.name)
-          end
-          dictionaries
-        end
-
-        # @param entity [Sketchup::Entity] entity to set attribute dictionaries
-        # rubocop:disable Metrics/CyclomaticComplexity
-        def self.attribute_dictionaries_to_native(entity, dictionaries)
-          return if dictionaries.nil?
-
-          classification_to_native(entity, dictionaries) if entity.is_a?(Sketchup::ComponentDefinition)
-
-          dictionaries.each do |dict_name, entries|
-            next unless entries.is_a?(Hash)
-
-            dict_name = dict_name == 'empty_dictionary_name' ? '' : dict_name
-            entries.each do |key, value|
-              set_attribute(entity, key, value, dict_name)
-            rescue StandardError => e
-              puts("Failed to write key: #{key} value: #{value} to dictionary #{dict_name}")
-              puts(e)
-            end
-          end
-        end
-        # rubocop:enable Metrics/CyclomaticComplexity
-
-        # Classification is ComponentDefinition specific, so they can be added only definition by add_classification
-        # method.
-        # @param definition_entity [Sketchup::ComponentDefinition] definition to add callback
-        def self.classification_to_native(definition_entity, dictionaries)
-          applied_schema_types = dictionaries['AppliedSchemaTypes']
-          return if applied_schema_types.nil?
-
-          applied_schema_types.each do |key, value|
-            definition_entity.add_classification(key, value)
-          end
-        end
-
         # @param entity [Sketchup::Entity] the sketchup entity of Speckle object
         # @param key [Symbol] the name of the attribute
         # @param dictionary_name [String, Symbol] the name of the attribute dictionary
@@ -105,9 +53,15 @@ module SpeckleConnector
           dictionary.delete_key(key)
         end
 
+        # @param entity [Sketchup::Entity] the sketchup entity of Speckle object
+        # @param dictionary_name [String, Symbol] the name of the attribute dictionary to remove
+        def self.remove_dictionary(entity, dictionary_name = self.dictionary_name)
+          entity.attribute_dictionaries.delete(dictionary_name)
+        end
+
         # @return [String] the name of the dictionary to read from
         def self.dictionary_name
-          DICTIONARY_NAME
+          raise NotImplementedError 'Implement this in subclass'
         end
       end
     end

speckle_connector/src/sketchup_model/dictionary/speckle_entity_dictionary_handler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'dictionary_handler'
+require_relative 'base_dictionary_handler'
 require_relative '../../constants/dict_constants'
 require_relative '../../constants/type_constants'
 
@@ -9,6 +9,8 @@ module SpeckleConnector
     module Dictionary
       # Dictionary handler of the speckle entity.
       class SpeckleEntityDictionaryHandler < DictionaryHandler
+        DICTIONARY_NAME = SPECKLE_BASE_OBJECT
+
         # Writes initial data while speckle entity is creating first time.
         # @param sketchup_entity [Sketchup::Entity] Sketchup entity to write data into it's attribute dictionary.
         # rubocop:disable Metrics/ParameterLists
@@ -26,6 +28,11 @@ module SpeckleConnector
           set_hash(sketchup_entity, initial_dict_data)
         end
         # rubocop:enable Metrics/ParameterLists
+
+        # @return [String] the name of the dictionary to read from
+        def self.dictionary_name
+          DICTIONARY_NAME
+        end
       end
     end
   end

speckle_connector/src/sketchup_model/dictionary/speckle_model_dictionary_handler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'dictionary_handler'
+require_relative 'base_dictionary_handler'
 require_relative '../../constants/dict_constants'
 require_relative '../../constants/type_constants'
 
@@ -8,7 +8,7 @@ module SpeckleConnector
   module SketchupModel
     module Dictionary
       # Dictionary handler of the speckle model.
-      class SpeckleModelDictionaryHandler < DictionaryHandler
+      class SpeckleModelDictionaryHandler < BaseDictionaryHandler
         DICTIONARY_NAME = 'Speckle'
         # Writes initial data while speckle entity is creating first time.
         # @param sketchup_model [Sketchup::Model] Sketchup model to write data into it's attribute dictionary.

speckle_connector/src/sketchup_model/dictionary/speckle_schema_dictionary_handler.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'delegate'
+require_relative 'dictionary_handler'
+require_relative '../../constants/dict_constants'
+
+module SpeckleConnector
+  module SketchupModel
+    module Dictionary
+      # Read and write attributes for Speckle objects' schema on SketchUp model.
+      class SpeckleSchemaDictionaryHandler < DictionaryHandler
+        def self.speckle_schema_to_speckle(entity)
+          schema = {}
+          return schema if entity.attribute_dictionaries.nil?
+
+          schema_dict = entity.attribute_dictionaries.find { |dict| dict.name == dictionary_name }
+          return schema if schema_dict.nil?
+
+          schema_dict.to_h
+        end
+
+        # @return [String] the name of the dictionary to read from
+        def self.dictionary_name
+          SPECKLE_MAPPING_TOOL_SCHEMA
+        end
+      end
+    end
+  end
+end

speckle_connector/src/sketchup_model/query/entity.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  module SketchupModel
+    # Query operations in sketchup model.
+    module Query
+      # Queries for entity.
+      class Entity
+        class << self
+          # Creates flat list for entities that defined in classes property. It searches from top to bottom to collect
+          # entities.
+          # @param entities_to_flat [Sketchup::Entities] entities to flat their children, grandchildren and so on..
+          # @param classes [Array<Class>] objects types to collect as flat list.
+          def flat_entities(entities_to_flat,
+                            classes = [Sketchup::Edge, Sketchup::Face, Sketchup::ComponentInstance,
+                                       Sketchup::Group, Sketchup::ComponentDefinition])
+            entities = []
+            entities_to_flat.each do |entity|
+              entities.append(entity) if classes.include?(entity.class)
+              if entity.is_a?(Sketchup::Group) || entity.is_a?(Sketchup::ComponentInstance)
+                entities.append(entity.definition) if classes.include?(Sketchup::ComponentDefinition)
+                entities += flat_entities(entity.definition.entities, classes)
+              end
+            end
+            entities
+          end
+
+          # Create array for each entity with their path.
+          # @param entities_to_flat [Sketchup::Entities, Array<Sketchup::Entity>] entities to flat with their path.
+          # @param classes [Array<Class>] classes to flat. Put class into this array if you want to find their paths.
+          # @param path [Array<Object>] path for entity that we are in.
+          # @return [Array<Object>] entity with it's path as flat array. See example.
+          # @example
+          #   path[0] is entity itself
+          #   path[1..-1] rest as path from top to bottom
+          def flat_entities_with_path(entities_to_flat,
+                                      classes = [Sketchup::Edge, Sketchup::Face, Sketchup::ComponentInstance,
+                                                 Sketchup::Group, Sketchup::ComponentDefinition],
+                                      path = [])
+            entities = []
+            entities_to_flat.each do |entity|
+              # Collect object itself
+              entities.append([entity] + path) if classes.include?(entity.class)
+              # entities[entity] = path if classes.include?(entity.class) && entities[entity].nil?
+
+              # Skip unless entity is a container entity like group or component.
+              next unless entity.is_a?(Sketchup::Group) || entity.is_a?(Sketchup::ComponentInstance)
+
+              # Add entity definition also with it's path.
+              entities[entity.definition] = path if classes.include?(Sketchup::ComponentDefinition)
+              # Collect sub-objects if object is a container at the same time.
+              sub_entities = flat_entities_with_path(entity.definition.entities.to_a,
+                                                     classes, path + [entity])
+              entities += sub_entities
+            end
+            entities
+          end
+
+          # Calculates global transformation of entity by multiplying path entries from bottom to top by reversing path.
+          # @param entity [Sketchup::Entity] entity to find global transformation.
+          # @param path [Array<Object>] path that parents of entity that has transformation value to calculate global
+          #  transformation of the entity.
+          # @return [Geom::Transformation] global transformation of the entity.
+          def global_transformation(entity, path)
+            # If entity is face, use Identity
+            global = entity.respond_to?(:transformation) ? entity.transformation : Geom::Transformation.new
+            path.reverse.each do |local|
+              global = local.transformation * global if local.respond_to?(:transformation)
+            end
+            global
+          end
+
+          # Global transformation search for entity that lies on only one instance.
+          # @param entity [Sketchup::Entity] entity to find global transformation.
+          def global_transformation_from_bottom(entity)
+            # If entity is face, use Identity
+            transformation = entity.respond_to?(:transformation) ? entity.transformation : Geom::Transformation.new
+            parent = parent_or_model(entity)
+            until parent.is_a?(Sketchup::Model) || parent.nil?
+              transformation = parent.transformation * transformation
+              parent = parent_or_model(parent)
+            end
+            transformation
+          end
+
+          # Parent search for entity from bottom to top. It is not ideal if entity lives in different instances.
+          def parent_or_model(entity)
+            parent = entity.parent
+            return parent if parent.is_a?(Sketchup::Model)
+
+            instances = parent.instances
+            if instances.length > 1
+              puts 'Parent has more than one instance'
+              instances.each(&:make_unique)
+              instances = instances.select { |instance| instance.definition.entities.include?(entity) }
+            end
+            instances.first
+          end
+
+          # Finds first material of parents from bottom to top.
+          def parent_material(path)
+            material = nil
+            path.reverse.each do |local|
+              material = local.material if local.respond_to?(:material)
+              return material unless material.nil?
+            end
+            material
+          end
+        end
+      end
+    end
+  end
+end

speckle_connector/src/sketchup_model/query/layer.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  module SketchupModel
+    # Query operations in sketchup model.
+    module Query
+      # Queries for layer and it's parents.
+      class Layer
+        class << self
+          # @param layer [Sketchup::Layer] layer to get folder path of the layer
+          # @return [Array<Sketchup::Folder>] path of the layer
+          def path(layer)
+            parent_folders = []
+            folder = layer.folder
+            until folder.nil?
+              parent_folders.append(folder)
+              folder = folder.folder
+            end
+            parent_folders.reverse
+          end
+
+          # @param entity [Sketchup::Entity] entity to find path.
+          def entity_path(entity, separation = '::')
+            path = path(entity.layer)
+            full_path = path.append(entity.layer)
+            full_path_string = ''
+            full_path.each_with_index do |layer, i|
+              full_path_string += layer.display_name
+              full_path_string += separation unless i == full_path.length - 1
+            end
+            full_path_string
+          end
+
+          # @param string_layer_path [String] string layer path to split.
+          def entity_layer_from_path(string_layer_path, separation = '::')
+            return string_layer_path if string_layer_path.nil?
+
+            string_layer_path.split(separation).last
+          end
+        end
+      end
+    end
+  end
+end

speckle_connector/src/sketchup_model/reader/speckle_entities_reader.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require_relative '../dictionary/speckle_schema_dictionary_handler'
 require_relative '../../speckle_entities/speckle_entity'
+require_relative '../../mapping/category/revit_category'
 require_relative '../../constants/dict_constants'
 
 module SpeckleConnector
@@ -11,6 +13,7 @@ module SpeckleConnector
       # Reader module for speckle entities.
       module SpeckleEntitiesReader
         # @param entities [Sketchup::Entities] entities to collect speckle entities.
+        # @return [Hash{String=>Sketchup::Entity}] speckle entities with persistent id.
         def self.read(entities)
           speckle_entities = {}
           entities.each do |entity|
@@ -26,6 +29,16 @@ module SpeckleConnector
           speckle_entities
         end
 
+        # @param entities [Sketchup::Entities] entities to collect mapped entities.
+        # @return [Hash{String=>Sketchup::Entity}] mapped entities with persistent id.
+        def self.read_mapped_entities(entities)
+          mapped_entities = {}
+          Query::Entity.flat_entities(entities).each do |entity|
+            mapped_entities[entity.persistent_id] = entity if mapped_with_schema?(entity)
+          end
+          mapped_entities
+        end
+
         # @param entity [Sketchup::Entity] sketchup entity to read from attribute dictionary.
         def self.read_speckle_entity(entity)
           dict = entity.attribute_dictionaries.to_a.find { |d| d.name == SPECKLE_BASE_OBJECT }
@@ -46,6 +59,71 @@ module SpeckleConnector
 
           entity.attribute_dictionaries.to_a.any? { |dict| dict.name == SPECKLE_BASE_OBJECT }
         end
+
+        # @param entity [Sketchup::Entity] sketchup entity to check whether mapped with speckle schema or not.
+        def self.mapped_with_schema?(entity)
+          is_entity_mapped = !Dictionary::SpeckleSchemaDictionaryHandler.attribute_dictionary(entity).nil?
+          return is_entity_mapped if is_entity_mapped
+          return is_entity_mapped unless entity.is_a?(Sketchup::ComponentInstance)
+
+          !Dictionary::SpeckleSchemaDictionaryHandler.attribute_dictionary(entity.definition).nil?
+        end
+
+        def self.get_schema(entity)
+          Dictionary::SpeckleSchemaDictionaryHandler.speckle_schema_to_speckle(entity)
+        end
+
+        def self.entities_schema_details(entities)
+          entities.collect do |entity|
+            entity_selection_details = entity_selection_details(entity)
+            if entity.is_a?(Sketchup::ComponentInstance)
+              entity_selection_details = entity_selection_details.merge(
+                { definition: entity_selection_details(entity.definition) }
+              )
+            end
+            entity_selection_details
+          end
+        end
+
+        def self.entity_selection_details(entity)
+          sanitized_type = entity.class.name.split('::').last.gsub(/(?<=[a-z])(?=[A-Z])/, ' ').split
+          is_definition = entity.is_a?(Sketchup::ComponentDefinition)
+          entity_type = is_definition ? sanitized_type.last : sanitized_type.first
+          speckle_schema = get_schema(entity)
+          {
+            name: speckle_schema['name'],
+            entityName: entity.respond_to?(:name) ? entity.name : '',
+            entityId: entity.persistent_id,
+            entityType: entity_type,
+            schema: speckle_schema,
+            numberOfInstances: is_definition ? entity.instances.length : 1
+          }
+        end
+
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
+        def self.mapped_entity_details(entities)
+          reverse_category_dictionary = Mapping::Category::RevitCategory.reverse_dictionary
+          entities.collect do |entity|
+            speckle_schema = get_schema(entity)
+            speckle_schema_definition = entity.respond_to?(:definition) ? get_schema(entity.definition) : nil
+            entity_type = entity.class.name.split('::').last.gsub(/(?<=[a-z])(?=[A-Z])/, ' ').split.first
+            {
+              name: speckle_schema['name'] || speckle_schema_definition['name'],
+              category: speckle_schema['category'] || speckle_schema_definition['category'],
+              categoryName: reverse_category_dictionary[speckle_schema['category']] ||
+                reverse_category_dictionary[speckle_schema_definition['category']],
+              method: speckle_schema['method'] || speckle_schema_definition['method'],
+              entityName: entity.respond_to?(:name) ? entity.name : '',
+              entityId: entity.persistent_id,
+              entityType: entity.is_a?(Sketchup::ComponentDefinition) ? 'Definition' : entity_type,
+              schema: speckle_schema,
+              definitionSchema: speckle_schema_definition
+            }
+          end
+        end
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
       end
     end
   end

speckle_connector/src/sketchup_model/utils/plane_utils.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  # Operations related to {SketchupModel}.
+  module SketchupModel
+    # Works directly with/on SketchUp Entities of different kinds (Groups, Faces, Edges, ...).
+    module Utils
+      # Static methods to do plane calculations with sketchup geom objects like Point3d and Vector3d.
+      class Plane
+        LENGTH_TOLERANCE = 1e-8
+
+        # Create plane from 3 points
+        # @param origin [Geom::Point3d] the point on the plane that wil become the origin of the local coordinate system
+        # @param point_1 [Geom::Point3d] the point that defines first direction
+        # @param point_2 [Geom::Point3d] the third point on the plane
+        # @return [Plane] the parametrization of the plane that goes through the given points
+        def self.from_points(origin, point_1, point_2)
+          direction_x = origin.vector_to(point_1).normalize
+          direction_x = direction_x.normalize
+          normal = direction_x.cross(origin.vector_to(point_2))
+          direction_y = direction_x.cross(normal.normalize)
+          new(origin: origin, direction_u: direction_x, direction_v: direction_y)
+        end
+
+        # @return [Geom::Vector3d] the direction of the u-axis on the plane
+        attr_reader :direction_u
+
+        # @return [Geom::Vector3d] the direction of the v-axis on the plane
+        attr_reader :direction_v
+
+        # @return [Geom::Point3d] the origin of the local coordinate system on the plane
+        attr_reader :origin
+
+        # @param origin [Geom::Point3d] the origin of the coordinate system on the plane
+        # @param direction_u [Geom::Vector3d] the direction of the x-axis
+        # @param direction_v [Geom::Vector3d] the direction of the y-axis
+        def initialize(origin:, direction_u:, direction_v:)
+          @origin = origin
+          @direction_u = direction_u
+          @direction_v = direction_v
+        end
+
+        # Get the point object in global coordinates for the point on the plane with local coordinates (u,v).
+        # @param coordinate_u [Float] the u-coordinate on the plane
+        # @param coordinate_v [Float] the v-coordinate on the plane
+        # @return [Geom::Point3d] the point in space that corresponds to the given (u, v) coordinates
+        def point_at(coordinate_u, coordinate_v)
+          scaled_direction_u = Geom::Vector3d.new(direction_u.x * coordinate_u,
+                                                  direction_u.y * coordinate_u,
+                                                  direction_u.z * coordinate_u)
+          scaled_direction_v = Geom::Vector3d.new(direction_v.x * coordinate_v,
+                                                  direction_v.y * coordinate_v,
+                                                  direction_v.z * coordinate_v)
+          origin + scaled_direction_u + scaled_direction_v
+        end
+
+        # Find local (u, v) coordinates of the projection of the given point to the plane
+        # @param point [Geom::Point3d] the point that will be projected to the plane
+        # @return [(Float, Float)] the local coordinates on the plane that correspond to the projected point
+        def plane_coordinates(point)
+          origin_to_point = origin.vector_to(point)
+          coordinate_u = origin_to_point.dot(direction_u)
+          coordinate_v = origin_to_point.dot(direction_v)
+          [coordinate_u, coordinate_v]
+        end
+
+        # Project a given point to the plane
+        # @param point [Geom::Point3d] the point that will be projected to the plane
+        # @return [Geom::Point3d] the projected point on the plane
+        def project_to_plane(point)
+          coordinate_u, coordinate_v = plane_coordinates(point)
+          point_at(coordinate_u, coordinate_v)
+        end
+
+        # Check if the given point lies on the plane
+        # @param point [Geom::Point3d] the point to check
+        # @return [Boolean] whether the point lies on the plane
+        def on_plane?(point)
+          point.distance(project_to_plane(point)).to_m < LENGTH_TOLERANCE
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_entities/speckle_entity.rb

@@ -51,9 +51,9 @@ module SpeckleConnector
         @sketchup_entity = sketchup_entity
         @application_id = application_id
         @id = speckle_id
-        @total_children_count = children.length
+        @total_children_count = children.nil? ? 0 : children.length
         @speckle_type = speckle_type
-        @speckle_children_objects = children
+        @speckle_children_objects = children.nil? ? [] : children
       end
       # rubocop:enable Metrics/ParameterLists
 

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/built_elements/revit/direct_shape.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require_relative '../../base'
+require_relative '../../other/render_material'
+require_relative '../../other/block_instance'
+require_relative '../../other/block_definition'
+require_relative '../../other/transform'
+require_relative '../../../constants/type_constants'
+require_relative '../../../sketchup_model/query/entity'
+require_relative '../../../sketchup_model/reader/speckle_entities_reader'
+require_relative '../../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      module Revit
+        # Direct shape definition for Revit mappings.
+        class DirectShape < Base
+          SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_REVIT_DIRECTSHAPE
+          READER = SketchupModel::Reader
+          QUERY = SketchupModel::Query
+          DICTIONARY = SketchupModel::Dictionary
+
+          def initialize(name:, category:, units:, base_geometries:, application_id: nil)
+            super(
+              speckle_type: SPECKLE_TYPE,
+              total_children_count: 0,
+              application_id: application_id,
+              id: nil
+            )
+            self[:name] = name
+            self[:category] = category
+            self[:units] = units
+            self[:baseGeometries] = base_geometries
+          end
+
+          def self.get_direct_shape_name(direct_shape)
+            if direct_shape['name'] == ''
+              direct_shape['applicationId'].to_s
+            else
+              "#{direct_shape['name']}::#{direct_shape['applicationId']}"
+            end
+          end
+
+          # @param state [States::State] state of the application.
+          def self.to_native(state, direct_shape, layer, entities, &convert_to_native)
+            direct_shape['geometry'] = direct_shape['baseGeometries']
+            direct_shape['name'] = get_direct_shape_name(direct_shape)
+
+            state, _definitions = Other::BlockDefinition.to_native(
+              state, direct_shape, layer, entities, &convert_to_native
+            )
+
+            definition = state.sketchup_state.sketchup_model
+                              .definitions[Other::BlockDefinition.get_definition_name(direct_shape)]
+
+            instance = entities.add_instance(definition, Geom::Transformation.new)
+            instance.name = direct_shape['name'] unless direct_shape['name'].nil?
+            DICTIONARY::SpeckleSchemaDictionaryHandler.set_hash(
+              instance,
+              {
+                name: direct_shape['name'], category: direct_shape['category'], method: 'Direct Shape'
+              }
+            )
+            new_speckle_state = state.speckle_state.with_mapped_entity(instance)
+            state = state.with_speckle_state(new_speckle_state)
+            instance.layer = layer unless layer.nil?
+
+            return state, [instance, definition]
+          end
+
+          # Collects direct shapes on selection as flat list.
+          def self.direct_shapes_on_selection(sketchup_model)
+            flat_selection_with_path = QUERY::Entity.flat_entities_with_path(
+              sketchup_model.selection,
+              [Sketchup::Face, Sketchup::ComponentInstance, Sketchup::Group], [sketchup_model]
+            )
+            mapped_selection = []
+            flat_selection_with_path.each do |entities|
+              entity = entities[0]
+              is_entity_mapped = READER::SpeckleEntitiesReader.mapped_with_schema?(entity)
+              if entity.respond_to?(:definition)
+                is_definition_mapped = READER::SpeckleEntitiesReader.mapped_with_schema?(entity.definition)
+                mapped_selection.append(entities) if is_entity_mapped || is_definition_mapped
+                next
+              end
+              mapped_selection.append(entities) if is_entity_mapped
+            end
+            mapped_selection
+          end
+
+          def self.from_entity(entity, path, units, preferences)
+            schema = DICTIONARY::SpeckleSchemaDictionaryHandler.attribute_dictionary(entity)
+            if schema.nil? && entity.respond_to?(:definition)
+              schema = DICTIONARY::SpeckleSchemaDictionaryHandler.attribute_dictionary(entity.definition)
+            end
+            entities_with_path = []
+            entities_with_path.append([entity] + path) if entity.is_a?(Sketchup::Face) || entity.is_a?(Sketchup::Edge)
+            # Collect here flat list
+            if entity.is_a?(Sketchup::ComponentInstance) || entity.is_a?(Sketchup::Group)
+              entities_with_path += QUERY::Entity
+                                    .flat_entities_with_path(
+                                      entity.definition.entities, [Sketchup::Face], path.append(entity)
+                                    )
+            end
+            base_geometries = group_faces_under_mesh_by_material(entities_with_path, units, preferences)
+            DirectShape.new(
+              name: schema[:name], category: schema[:category], units: units,
+              base_geometries: base_geometries, application_id: entity.persistent_id
+            )
+          end
+
+          # rubocop:disable Metrics/MethodLength
+          def self.group_faces_under_mesh_by_material(faces_with_path, units, preferences)
+            mesh_groups = {}
+            faces_with_path.each do |face_with_path|
+              face = face_with_path[0]
+              entity_path = face_with_path[1..-1]
+              parent_material = QUERY::Entity.parent_material(entity_path)
+              mesh_group_id = Geometry::Mesh.get_mesh_group_id(face, preferences[:model], parent_material)
+
+              if mesh_groups.key?(mesh_group_id)
+                mesh_group = mesh_groups[mesh_group_id]
+                mesh_group[0].face_to_mesh(face, QUERY::Entity.global_transformation(face, entity_path))
+                mesh_group[1].append(face)
+              else
+                mesh = Geometry::Mesh.from_face(
+                  face: face, units: units, model_preferences: preferences[:model],
+                  global_transform: QUERY::Entity.global_transformation(face, entity_path),
+                  parent_material: parent_material
+                )
+                mesh_groups[mesh_group_id] = [mesh, [face]]
+              end
+            end
+            # Update mesh overwrites points and polygons into base object.
+            mesh_groups.each { |_, mesh| mesh.first.update_mesh }
+            mesh_groups.values
+          end
+          # rubocop:enable Metrics/MethodLength
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/built_elements/view3d.rb

@@ -2,6 +2,7 @@
 
 require_relative '../base'
 require_relative '../../constants/type_constants'
+require_relative '../../speckle_objects/geometry/length'
 require_relative '../../speckle_objects/geometry/point'
 require_relative '../../speckle_objects/geometry/vector'
 
@@ -45,48 +46,121 @@ module SpeckleConnector
         end
         # rubocop:enable Metrics/ParameterLists
 
+        # Collects scenes as views from sketchup model.
+        # @param sketchup_model [Sketchup::Model] sketchup model to collect views from pages.
+        # @param units [String] units of the model.
+        def self.from_model(sketchup_model, units)
+          sketchup_model.pages.collect { |page| from_page(page, units) }
+        end
+
+        # @param page [Sketchup::Page] page to convert speckle view.
+        def self.from_page(page, units)
+          cam = page.camera
+          origin = get_camera_origin(cam, units)
+          target = get_camera_target(cam, units)
+          direction = get_camera_direction(cam, units)
+          update_properties = get_scene_update_properties(page)
+          rendering_options = SpeckleObjects::Other::RenderingOptions.to_speckle(page.rendering_options)
+          View3d.new(
+            page.name, origin, target, direction, SpeckleObjects::Geometry::Vector.new(0, 0, 1, units),
+            cam.perspective?, cam.fov, units, page.name, update_properties, rendering_options
+          )
+        end
+
+        # @param state [States::State] state of the speckle app.
         # @param obj [Hash] commit object.
-        # @param sketchup_model [Sketchup::Model] active sketchup model.
         # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/CyclomaticComplexity
-        def self.to_native(obj, sketchup_model)
-          views = collect_views(obj)
-          return if views.empty?
+        # rubocop:disable Metrics/PerceivedComplexity
+        def self.to_native(state, view, _layer, _entities, &_convert_to_native)
+          sketchup_model = state.sketchup_state.sketchup_model
 
-          views.each do |view|
-            next unless view['speckle_type'] == 'Objects.BuiltElements.View:Objects.BuiltElements.View3D'
+          return state, [] unless view['speckle_type'] == 'Objects.BuiltElements.View:Objects.BuiltElements.View3D'
 
-            name = view['name'] || view['id']
-            next if sketchup_model.pages.any? { |page| page.name == name }
+          name = view['name'] || view['id']
+          return state, [] if sketchup_model.pages.any? { |page| page.name == name }
 
-            origin = view['origin']
-            target = view['target']
-            lens = view['lens'] || 50
-            origin = SpeckleObjects::Geometry::Point.to_native(origin['x'], origin['y'], origin['z'], origin['units'])
-            target = SpeckleObjects::Geometry::Point.to_native(target['x'], target['y'], target['z'], target['units'])
-            # Set camera position before creating scene on it.
-            my_camera = Sketchup::Camera.new(origin, target, [0, 0, 1], !view['isOrthogonal'], lens)
-            sketchup_model.active_view.camera = my_camera
-            sketchup_model.pages.add(name)
-            page = sketchup_model.pages[name]
-            set_page_update_properties(page, view['update_properties']) if view['update_properties']
-            set_rendering_options(page.rendering_options, view['rendering_options']) if view['rendering_options']
-          end
+          origin = view['origin']
+          target = view['target']
+          lens = view['lens'] || 50
+          origin = SpeckleObjects::Geometry::Point.to_native(origin['x'], origin['y'], origin['z'], origin['units'])
+          target = SpeckleObjects::Geometry::Point.to_native(target['x'], target['y'], target['z'], target['units'])
+          view_direction = (origin - target).normalize
+          up = view_direction.parallel?([0, 0, 1]) ? [0, 1, 0] : [0, 0, 1]
+          # Set camera position before creating scene on it.
+          my_camera = Sketchup::Camera.new(origin, target, up, !view['isOrthogonal'], lens)
+          sketchup_model.active_view.camera = my_camera
+          sketchup_model.pages.add(name)
+          page = sketchup_model.pages[name]
+          set_page_update_properties(page, view['update_properties']) if view['update_properties']
+          set_rendering_options(page.rendering_options, view['rendering_options']) if view['rendering_options']
+          return state, [page]
         end
         # rubocop:enable Metrics/AbcSize
-        # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
 
-        def self.collect_views(obj)
-          views = []
-          views += obj.filter_map do |_key, value|
-            if value.is_a?(Array) &&
-               value.any? { |v| v['speckle_type'] == OBJECTS_BUILTELEMENTS_VIEW3D }
-              value
-            end
+        # @param page [Sketchup::Page] scene to update -update properties-
+        def self.set_page_update_properties(page, update_properties)
+          update_properties.each do |prop, value|
+            page.instance_variable_set(:"@#{prop}", value)
           end
-          views.flatten.select { |view| view['speckle_type'] == OBJECTS_BUILTELEMENTS_VIEW3D }
+        end
+
+        # @param rendering_options [Sketchup::RenderingOptions] rendering options of scene (page)
+        def self.set_rendering_options(rendering_options, speckle_rendering_options)
+          speckle_rendering_options.each do |prop, value|
+            next if rendering_options[prop].nil?
+
+            rendering_options[prop] = if value.is_a?(Hash)
+                                        SpeckleObjects::Other::Color.to_native(value)
+                                      else
+                                        value
+                                      end
+          end
+        end
+
+        # Get scene properties
+        # @param page [Sketchup::Page] page on sketchup.
+        def self.get_scene_update_properties(page)
+          {
+            use_axes: page.use_axes?,
+            use_camera: page.use_camera?,
+            use_hidden_geometry: page.use_hidden_geometry?,
+            use_hidden_layers: page.use_hidden_layers?,
+            use_hidden_objects: page.use_hidden_objects?,
+            use_rendering_options: page.use_rendering_options?,
+            use_section_planes: page.use_section_planes?,
+            use_shadow_info: page.use_shadow_info?,
+            use_style: page.use_style?
+          }
+        end
+
+        def self.get_camera_direction(camera, units)
+          SpeckleObjects::Geometry::Vector.new(
+            SpeckleObjects::Geometry.length_to_speckle(camera.direction[0], units),
+            SpeckleObjects::Geometry.length_to_speckle(camera.direction[1], units),
+            SpeckleObjects::Geometry.length_to_speckle(camera.direction[2], units),
+            units
+          )
+        end
+
+        def self.get_camera_target(camera, units)
+          SpeckleObjects::Geometry::Point.new(
+            SpeckleObjects::Geometry.length_to_speckle(camera.target[0], units),
+            SpeckleObjects::Geometry.length_to_speckle(camera.target[1], units),
+            SpeckleObjects::Geometry.length_to_speckle(camera.target[2], units),
+            units
+          )
+        end
+
+        def self.get_camera_origin(camera, units)
+          SpeckleObjects::Geometry::Point.new(
+            SpeckleObjects::Geometry.length_to_speckle(camera.eye[0], units),
+            SpeckleObjects::Geometry.length_to_speckle(camera.eye[1], units),
+            SpeckleObjects::Geometry.length_to_speckle(camera.eye[2], units),
+            units
+          )
         end
       end
     end

speckle_connector/src/speckle_objects/geometry/line.rb

@@ -5,7 +5,8 @@ require_relative 'point'
 require_relative 'bounding_box'
 require_relative '../base'
 require_relative '../primitive/interval'
-require_relative '../../sketchup_model/dictionary/dictionary_handler'
+require_relative '../../sketchup_model/dictionary/base_dictionary_handler'
+require_relative '../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -17,11 +18,11 @@ module SpeckleConnector
         # @param start_pt [Geometry::Point] start point speckle object of the speckle line.
         # @param end_pt [Geometry::Point] end point speckle object of the speckle line.
         # @param domain [Primitive::Interval] interval speckle object of the speckle line -represents domain.
-        # @param bbox [Geometry::BoundingBox] bounding box speckle object of the speckle line.
         # @param units [String] units of the speckle line.
         # @param application_id [String, nil] entity id of the {Sketchup::Edge} that represents to the speckle line.
         # rubocop:disable Metrics/ParameterLists
-        def initialize(start_pt:, end_pt:, domain:, bbox:, units:, sketchup_attributes: {}, application_id: nil)
+        def initialize(start_pt:, end_pt:, domain:, units:, layer:,
+                       sketchup_attributes: {}, speckle_schema: {}, application_id: nil)
           super(
               speckle_type: 'Objects.Geometry.Line',
               total_children_count: 0,
@@ -31,30 +32,30 @@ module SpeckleConnector
           self[:start] = start_pt
           self[:end] = end_pt
           self[:domain] = domain
-          self[:bbox] = bbox
           self[:units] = units
+          self[:layer] = layer unless layer.nil?
+          self[:SpeckleSchema] = speckle_schema if speckle_schema.any?
           self[:sketchup_attributes] = sketchup_attributes if sketchup_attributes.any?
         end
         # rubocop:enable Metrics/ParameterLists
 
         # @param edge [Sketchup::Edge] edge to convert line.
         def self.from_edge(edge, units, model_preferences)
-          dictionaries = {}
-          if model_preferences[:include_entity_attributes] && model_preferences[:include_edge_entity_attributes]
-            dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(edge)
-          end
+          dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
+                         .attribute_dictionaries_to_speckle(edge, model_preferences)
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
+          speckle_schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.speckle_schema_to_speckle(edge)
           start_pt = Geometry::Point.from_vertex(edge.start.position, units)
           end_pt = Geometry::Point.from_vertex(edge.end.position, units)
           domain = Primitive::Interval.from_numeric(0, Float(edge.length), units)
-          bbox = Geometry::BoundingBox.from_bounds(edge.bounds, units)
           Line.new(
             start_pt: start_pt,
             end_pt: end_pt,
             domain: domain,
-            bbox: bbox,
             units: units,
+            layer: SketchupModel::Query::Layer.entity_path(edge),
             sketchup_attributes: att,
+            speckle_schema: speckle_schema,
             application_id: edge.persistent_id.to_s
           )
         end
@@ -64,6 +65,8 @@ module SpeckleConnector
         # @param layer [Sketchup::Layer] layer to add {Sketchup::Edge} into it.
         # @param entities [Sketchup::Entities] entities collection to add {Sketchup::Edge} into it.
         # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/CyclomaticComplexity
         def self.to_native(state, line, layer, entities, &_convert_to_native)
           if line.key?('value')
             values = line['value']
@@ -75,25 +78,28 @@ module SpeckleConnector
             end_pt = Point.to_native(line['end']['x'], line['end']['y'], line['end']['z'], line['units'])
             edges = entities.add_edges(start_pt, end_pt)
           end
+          line_layer_name = SketchupModel::Query::Layer.entity_layer_from_path(line['layer'])
+          line_layer = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == line_layer_name }
           edges.each do |edge|
-            edge.layer = layer
+            edge.layer = line_layer.nil? ? layer : line_layer
             unless line['sketchup_attributes'].nil?
-              SketchupModel::Dictionary::DictionaryHandler
+              SketchupModel::Dictionary::BaseDictionaryHandler
                 .attribute_dictionaries_to_native(edge, line['sketchup_attributes']['dictionaries'])
             end
           end
           return state, edges
         end
         # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
 
         def self.test_line(start_point, end_point, units)
           domain = Primitive::Interval.from_numeric(0, 5, units)
-          bbox = Geometry::BoundingBox.test_bounds(units)
           Line.new(
             start_pt: start_point,
             end_pt: end_point,
             domain: domain,
-            bbox: bbox,
+            layer: 'test',
             application_id: '',
             units: units
           )

speckle_connector/src/speckle_objects/geometry/mesh.rb

@@ -3,8 +3,13 @@
 require_relative '../base'
 require_relative '../geometry/bounding_box'
 require_relative '../other/render_material'
+require_relative '../../sketchup_model/query/entity'
 require_relative '../../convertors/clean_up'
+require_relative '../../sketchup_model/dictionary/base_dictionary_handler'
+require_relative '../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 require_relative '../../sketchup_model/dictionary/dictionary_handler'
+require_relative '../../sketchup_model/utils/plane_utils'
+require_relative '../../sketchup_model/query/layer'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -29,7 +34,8 @@ module SpeckleConnector
         # @param faces [Array] faces of the speckle mesh.
         # @param sketchup_attributes [Hash] additional information about speckle mesh.
         # rubocop:disable Metrics/ParameterLists
-        def initialize(units:, render_material:, vertices:, faces:, sketchup_attributes:, application_id: nil)
+        def initialize(units:, render_material:, vertices:, faces:,
+                       sketchup_attributes:, layer:, speckle_schema: {}, application_id: nil)
           super(
             speckle_type: SPECKLE_TYPE,
             total_children_count: 0,
@@ -40,14 +46,35 @@ module SpeckleConnector
           @polygons = []
           @units = units
           self[:units] = units
+          self[:layer] = layer
           self[:renderMaterial] = render_material
-          # self[:bbox] = bbox
           self[:'@(31250)vertices'] = vertices
           self[:'@(62500)faces'] = faces
           self[:sketchup_attributes] = sketchup_attributes if sketchup_attributes.any?
+          self[:SpeckleSchema] = speckle_schema if speckle_schema.any?
         end
         # rubocop:enable Metrics/ParameterLists
 
+        # Checks 4 points are planar or not.
+        def self.check_4_points_planar(points)
+          plane = SketchupModel::Utils::Plane.from_points(points[0], points[1], points[2])
+          plane.on_plane?(points[3])
+        end
+
+        # Add quad mesh to sketchup native mesh by checking planarity.
+        # @param native_mesh [Geom::Mesh] sketchup mesh to convert them later faces.
+        # @param polygon_points [Array<Geom::Point3d>] sketchup points to add them with polygon to mesh.
+        def self.add_quad_mesh(native_mesh, polygon_points)
+          is_planar = check_4_points_planar(polygon_points)
+          if is_planar
+            native_mesh.add_polygon(polygon_points)
+          else
+            native_mesh.add_polygon([polygon_points[0], polygon_points[1], polygon_points[2]])
+            native_mesh.add_polygon([polygon_points[0], polygon_points[2], polygon_points[3]])
+          end
+          is_planar
+        end
+
         # @param entities [Sketchup::Entities] entities to add
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
@@ -63,15 +90,23 @@ module SpeckleConnector
           # Initialize native PolygonMesh object later to add polygon inside it.
           native_mesh = Geom::PolygonMesh.new(mesh['vertices'].count / 3)
           faces = mesh['faces']
+          has_any_non_planar_quad_mesh = false
           while faces.count > 0
             num_pts = faces.shift
             # 0 -> 3, 1 -> 4 to preserve backwards compatibility
             num_pts += 3 if num_pts < 3
             indices = faces.shift(num_pts)
-            native_mesh.add_polygon(indices.map { |index| points[index] })
+            polygon_points = indices.map { |index| points[index] }
+            # Quad mesh
+            if num_pts == 4
+              is_planar = add_quad_mesh(native_mesh, polygon_points)
+              has_any_non_planar_quad_mesh = true unless is_planar
+            else
+              native_mesh.add_polygon(polygon_points)
+            end
           end
-          state, _materials = Other::RenderMaterial.to_native(state, mesh['renderMaterial'],
-                                                              layer, entities, &convert_to_native)
+          state, _materials = Other::RenderMaterial.to_native(state, mesh['renderMaterial'], layer,
+                                                              entities, &convert_to_native)
           # Find and assign material if exist
           unless mesh['renderMaterial'].nil?
             material_name = mesh['renderMaterial']['name'] || mesh['renderMaterial']['id']
@@ -82,10 +117,15 @@ module SpeckleConnector
           # Add faces from mesh with material and smooth setting
           entities.add_faces_from_mesh(native_mesh, smooth_flags, material, material)
           added_faces = entities.grep(Sketchup::Face).last(native_mesh.polygons.length)
+          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 = 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
             unless mesh['sketchup_attributes'].nil?
-              SketchupModel::Dictionary::DictionaryHandler
+              SketchupModel::Dictionary::BaseDictionaryHandler
                 .attribute_dictionaries_to_native(face, mesh['sketchup_attributes']['dictionaries'])
             end
           end
@@ -101,37 +141,45 @@ module SpeckleConnector
         # rubocop:enable Metrics/PerceivedComplexity:
 
         # @param face [Sketchup::Face] face to convert mesh
+        # @param units [String] model units to send Speckle.
+        # @param model_preferences [Hash{Symbol=>Boolean}] model preferences to check include attributes or not.
+        # @param global_transform [Geom::Transformation, nil] global transformation value of face if it is not included
+        #  into any component.
         # rubocop:disable Style/MultilineTernaryOperator
-        # rubocop:disable Metrics/CyclomaticComplexity
-        def self.from_face(face, units, model_preferences)
-          dictionaries = {}
-          if model_preferences[:include_entity_attributes] && model_preferences[:include_face_entity_attributes]
-            dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(face)
-          end
+        def self.from_face(face:, units:, model_preferences:, global_transform: nil, parent_material: nil)
+          dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
+                         .attribute_dictionaries_to_speckle(face, model_preferences)
           has_any_soften_edge = face.edges.any?(&:soft?)
           att = dictionaries.any? ? { is_soften: has_any_soften_edge, dictionaries: dictionaries }
                   : { is_soften: has_any_soften_edge }
+          speckle_schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.speckle_schema_to_speckle(face)
+          material = face.material || face.back_material || parent_material
           speckle_mesh = Mesh.new(
             units: units,
-            render_material: face.material.nil? && face.back_material.nil? ? nil : Other::RenderMaterial
-                                                          .from_material(face.material || face.back_material),
-            # bbox: Geometry::BoundingBox.from_bounds(face.bounds, units),
-            vertices: [],
-            faces: [],
-            sketchup_attributes: att,
+            render_material: material.nil? ? nil : Other::RenderMaterial.from_material(material),
+            vertices: [], faces: [], sketchup_attributes: att,
+            layer: SketchupModel::Query::Layer.entity_path(face),
+            speckle_schema: speckle_schema,
             application_id: face.persistent_id
           )
-          speckle_mesh.face_to_mesh(face)
+          speckle_mesh.face_to_mesh(face, global_transform)
           speckle_mesh.update_mesh
           speckle_mesh
         end
         # rubocop:enable Style/MultilineTernaryOperator
-        # rubocop:enable Metrics/CyclomaticComplexity
 
-        def face_to_mesh(face)
+        # @param global_transform [Geom::Transformation, nil] global transformation value of face if it is not included
+        #  into any component. So it's mesh will be transformed into global coordinates to represent it correctly in
+        #  Speckle viewer or other connectors.
+        def face_to_mesh(face, global_transform = nil)
           mesh = face.loops.count > 1 ? face.mesh : nil
-          mesh.nil? ? face_vertices_to_array(face) : mesh_points_to_array(mesh)
-          mesh.nil? ? face_indices_to_array(face) : mesh_faces_to_array(mesh)
+          if global_transform.nil?
+            mesh.nil? ? face_vertices_to_array(face) : mesh_points_to_array(mesh)
+            mesh.nil? ? face_indices_to_array(face) : mesh_faces_to_array(mesh)
+          else
+            mesh_points_to_array(face.mesh, global_transform)
+            mesh_faces_to_array(face.mesh, global_transform)
+          end
         end
 
         # Collects indexed Sketchup vertices into flat array for Speckle use.
@@ -176,7 +224,8 @@ module SpeckleConnector
 
         # Get a flat array of vertices from a sketchup polygon mesh
         # @param mesh [Geom::PolygonMesh] mesh to get points.
-        def mesh_points_to_array(mesh)
+        def mesh_points_to_array(mesh, global_transform = nil)
+          mesh.transform!(global_transform) unless global_transform.nil?
           mesh.points.each do |pt|
             # FIXME: Enable previous line when viewer supports shared vertices
             # vertices.push(pt) unless vertices.any? { |point| point == pt }
@@ -186,7 +235,8 @@ module SpeckleConnector
 
         # Get an array of face indices from a sketchup polygon mesh
         # @param mesh [Geom::PolygonMesh] mesh to convert into polygons.
-        def mesh_faces_to_array(mesh)
+        def mesh_faces_to_array(mesh, global_transform = nil)
+          mesh.transform!(global_transform) unless global_transform.nil?
           mesh.polygons.each do |poly|
             global_polygon_array = [poly.count]
             poly.each do |index|
@@ -225,6 +275,39 @@ module SpeckleConnector
           end
           points
         end
+
+        # Mesh group id helps to determine how to group faces into meshes.
+        # @param face [Sketchup::Face] face to get mesh group id.
+        def self.get_mesh_group_id(face, model_preferences, parent_material = nil)
+          if model_preferences[:include_entity_attributes] &&
+             model_preferences[:include_face_entity_attributes] &&
+             attribute_dictionary?(face)
+            return face.persistent_id.to_s
+          end
+
+          material = face.material || face.back_material || parent_material
+          layer_name = face.layer.display_name
+          return layer_name if material.nil?
+
+          return material.entityID.to_s + layer_name
+        end
+
+        def self.attribute_dictionary?(face)
+          any_attribute_dictionary = !(face.attribute_dictionaries.nil? || face.attribute_dictionaries.first.nil?)
+          return any_attribute_dictionary unless any_attribute_dictionary
+
+          # If there are any attribute dictionary, then make sure that they are not ignored ones.
+          all_attribute_dictionary_ignored = face.attribute_dictionaries.all? do |dict|
+            ignored_dictionaries.include?(dict.name)
+          end
+          !all_attribute_dictionary_ignored
+        end
+
+        def self.ignored_dictionaries
+          [
+            'Speckle_Base_Object'
+          ]
+        end
       end
     end
   end

speckle_connector/src/speckle_objects/gis/polygon_element.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../other/transform'
+require_relative '../other/block_definition'
+require_relative '../other/block_instance'
+require_relative '../../constants/type_constants'
+require_relative '../../sketchup_model/dictionary/dictionary_handler'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module GIS
+      # BoundingBox object definition for Speckle.
+      class PolygonElement < Base
+        SPECKLE_TYPE = OBJECTS_GIS_POLYGONELEMENT
+
+        def self.get_definition_name(obj, attributes)
+          return obj['name'] unless obj['name'].nil?
+
+          return attributes['name'] unless attributes['name'].nil?
+
+          return "def::#{obj['id']}"
+        end
+
+        def self.get_qgis_attributes(obj)
+          attributes = obj['attributes'].to_h
+          speckle_properties = %w[id speckle_type totalChildrenCount units applicationId]
+          speckle_properties.each { |key| attributes.delete(key) }
+          attributes
+        end
+
+        # Handles polygon element differently from display value.
+        def self.to_native(state, obj, layer, entities, &convert_to_native)
+          attributes = get_qgis_attributes(obj)
+          obj = collect_definition_geometries(obj)
+          obj['name'] = get_definition_name(obj, attributes)
+
+          state, _definitions = Other::BlockDefinition.to_native(
+            state, obj, layer, entities, &convert_to_native
+          )
+
+          definition = state.sketchup_state.sketchup_model
+                            .definitions[Other::BlockDefinition.get_definition_name(obj)]
+
+          Other::BlockInstance.find_and_erase_existing_instance(definition, obj['id'], obj['applicationId'])
+          t_arr = obj['transform']
+          transform = t_arr.nil? ? Geom::Transformation.new : Other::Transform.to_native(t_arr, obj['units'])
+          instance = entities.add_instance(definition, transform)
+          instance.name = obj['name'] unless obj['name'].nil?
+          SketchupModel::Dictionary::DictionaryHandler.set_hash(instance, attributes, 'qgis')
+          SketchupModel::Dictionary::DictionaryHandler.set_hash(definition, attributes, 'qgis')
+          # Align instance axes that created from display value. (without any transform)
+          Other::BlockInstance.align_instance_axes(instance)
+          return state, [instance, definition]
+        end
+
+        def self.collect_definition_geometries(obj)
+          geometries = []
+
+          # FIXME: This type check needed because of QGIS. It can send geometries both way, object or array..
+          #  This is something need to be fixed by QGIS.
+          if obj['geometry'].is_a?(Array)
+            obj['geometry'].each do |geometry|
+              display_value = geometry['displayValue']
+
+              geometries += display_value
+            end
+          else
+            geometries += obj['geometry']['displayValue']
+          end
+
+          geometries.each do |geo|
+            if geo['speckle_type'] && geo['speckle_type'] == OBJECTS_GEOMETRY_MESH
+              geo['sketchup_attributes'] = { 'is_soften' => false }
+            end
+          end
+
+          obj['geometry'] = geometries
+          obj
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/other/block_definition.rb

@@ -7,7 +7,8 @@ require_relative '../base'
 require_relative '../geometry/point'
 require_relative '../geometry/mesh'
 require_relative '../geometry/bounding_box'
-require_relative '../../sketchup_model/dictionary/dictionary_handler'
+require_relative '../../sketchup_model/dictionary/base_dictionary_handler'
+require_relative '../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -22,7 +23,7 @@ module SpeckleConnector
         # @param application_id [String, NilClass] application id of the block definition.
         # rubocop:disable Metrics/ParameterLists
         def initialize(geometry:, name:, units:, always_face_camera:, sketchup_attributes: {},
-                       application_id: nil)
+                       speckle_schema: {}, application_id: nil)
           super(
             speckle_type: SPECKLE_TYPE,
             total_children_count: 0,
@@ -33,7 +34,8 @@ module SpeckleConnector
           self[:name] = name
           self[:always_face_camera] = always_face_camera
           self[:sketchup_attributes] = sketchup_attributes if sketchup_attributes.any?
-          # FIXME: Since geometry sends with @ as detached, block basePlane renders on viewer.
+          self[:SpeckleSchema] = speckle_schema if speckle_schema.any?
+          # '@@' means that it is a detached property.
           self['@@geometry'] = geometry
         end
         # rubocop:enable Metrics/ParameterLists
@@ -42,32 +44,19 @@ module SpeckleConnector
         #  instance
         # @param units [String] units of the Sketchup model
         # @param definitions [Hash{String=>BlockDefinition}] all converted {BlockDefinition}s on the converter.
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/MethodLength
-        # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/ParameterLists
-        def self.from_definition(definition, units, definitions, preferences, speckle_state, parent, &convert)
-          guid = definition.guid
-          return definitions[guid] if definitions.key?(guid)
-
-          dictionaries = {}
-          if preferences[:model][:include_entity_attributes]
-            if definition.group?
-              if preferences[:model][:include_group_entity_attributes]
-                dictionaries = SketchupModel::Dictionary::DictionaryHandler
-                               .attribute_dictionaries_to_speckle(definition)
-              end
-            elsif preferences[:model][:include_component_entity_attributes]
-              dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(definition)
-            end
-          end
+        def self.from_definition(definition, units, preferences, speckle_state, parent, &convert)
+          dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
+                         .attribute_dictionaries_to_speckle(definition, preferences[:model])
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
+          speckle_schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler
+                           .speckle_schema_to_speckle(definition)
 
           # TODO: Solve logic
           geometry = if definition.entities[0].is_a?(Sketchup::Edge) || definition.entities[0].is_a?(Sketchup::Face)
                        new_speckle_state, geo = group_entities_to_speckle(
-                         definition, preferences, speckle_state, parent, &convert
+                         definition.entities, preferences, speckle_state, parent, &convert
                        )
                        speckle_state = new_speckle_state
                        geo
@@ -83,21 +72,18 @@ module SpeckleConnector
                        end
                      end
 
-          # FIXME: Decide how to approach base point of the definition instead origin.
           block_definition = BlockDefinition.new(
             units: units,
             name: definition.name,
-            geometry: geometry,
+            geometry: geometry.compact,
             always_face_camera: definition.behavior.always_face_camera?,
             sketchup_attributes: att,
+            speckle_schema: speckle_schema,
             application_id: definition.persistent_id.to_s
           )
           return speckle_state, block_definition
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/MethodLength
-        # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/ParameterLists
 
         def self.get_definition_name(def_obj)
@@ -120,7 +106,12 @@ module SpeckleConnector
           definition_name = get_definition_name(definition_obj)
           application_id = definition_obj['applicationId']
           definition = sketchup_model.definitions[definition_name]
-          if definition && (definition.name == definition_name || definition.guid == application_id)
+
+          # Check any entities of definition changed
+          entities_updated = entities_updated?(definition, definition_obj)
+
+          if definition && !entities_updated &&
+             (definition.name == definition_name || definition.guid == application_id)
             return state, [definition]
           end
 
@@ -130,7 +121,6 @@ module SpeckleConnector
           sketchup_attributes = definition_obj['sketchup_attributes']
           definition&.entities&.clear!
           definition ||= sketchup_model.definitions.add(definition_name)
-          definition.layer = layer
 
           if geometry.is_a?(Array)
             geometry.each do |obj|
@@ -144,7 +134,7 @@ module SpeckleConnector
           # puts("    entity count: #{definition.entities.count}")
           definition.behavior.always_face_camera = always_face_camera
           unless sketchup_attributes.nil?
-            SketchupModel::Dictionary::DictionaryHandler
+            SketchupModel::Dictionary::BaseDictionaryHandler
               .attribute_dictionaries_to_native(definition, sketchup_attributes['dictionaries'])
           end
           return state, [definition]
@@ -158,21 +148,21 @@ module SpeckleConnector
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
-        def self.group_entities_to_speckle(definition, preferences, speckle_state, parent, &convert)
-          orphan_edges = definition.entities.grep(Sketchup::Edge).filter { |edge| edge.faces.none? }
+        def self.group_entities_to_speckle(entities, preferences, speckle_state, parent, &convert)
+          orphan_edges = entities.grep(Sketchup::Edge).filter { |edge| edge.faces.none? }
           lines = orphan_edges.collect do |orphan_edge|
             new_speckle_state, converted = convert.call(orphan_edge, preferences, speckle_state, parent)
             speckle_state = new_speckle_state
             converted
           end
 
-          nested_blocks = definition.entities.grep(Sketchup::ComponentInstance).collect do |component_instance|
+          nested_blocks = entities.grep(Sketchup::ComponentInstance).collect do |component_instance|
             new_speckle_state, converted = convert.call(component_instance, preferences, speckle_state, parent)
             speckle_state = new_speckle_state
             converted
           end
 
-          nested_groups = definition.entities.grep(Sketchup::Group).collect do |group|
+          nested_groups = entities.grep(Sketchup::Group).collect do |group|
             new_speckle_state, converted = convert.call(group, preferences, speckle_state, parent)
             speckle_state = new_speckle_state
             converted
@@ -180,7 +170,9 @@ module SpeckleConnector
 
           if preferences[:model][:combine_faces_by_material]
             mesh_groups = {}
-            definition.entities.grep(Sketchup::Face).collect do |face|
+            entities.grep(Sketchup::Face).collect do |face|
+              next unless SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.attribute_dictionary(face).nil?
+
               new_speckle_state = group_meshes_by_material(
                 face, mesh_groups, speckle_state, preferences, parent, &convert
               )
@@ -192,7 +184,7 @@ module SpeckleConnector
             return speckle_state, lines + nested_blocks + nested_groups + mesh_groups.values
           else
             meshes = []
-            definition.entities.grep(Sketchup::Face).collect do |face|
+            entities.grep(Sketchup::Face).collect do |face|
               new_speckle_state, converted = convert.call(face, preferences, speckle_state, parent)
               meshes.append(converted)
               speckle_state = new_speckle_state
@@ -209,7 +201,7 @@ module SpeckleConnector
         # rubocop:disable Metrics/ParameterLists
         def self.group_meshes_by_material(face, mesh_groups, speckle_state, preferences, parent, &convert)
           # convert material
-          mesh_group_id = get_mesh_group_id(face, preferences[:model])
+          mesh_group_id = Geometry::Mesh.get_mesh_group_id(face, preferences[:model])
           new_speckle_state, converted = convert.call(face, preferences, speckle_state, parent)
           mesh_groups[mesh_group_id] = converted unless mesh_groups.key?(mesh_group_id)
           mesh_group = mesh_groups[mesh_group_id]
@@ -219,36 +211,17 @@ module SpeckleConnector
         end
         # rubocop:enable Metrics/ParameterLists
 
-        # Mesh group id helps to determine how to group faces into meshes.
-        # @param face [Sketchup::Face] face to get mesh group id.
-        def self.get_mesh_group_id(face, model_preferences)
-          if model_preferences[:include_entity_attributes] &&
-             model_preferences[:include_face_entity_attributes] &&
-             attribute_dictionary?(face)
-            return face.persistent_id.to_s
+        # It is important check for hosted elements that wrapped into component in sketchup.
+        # Their definition name might be stay same but their speckle ids should be checked
+        # to compare they updated or not.
+        def self.entities_updated?(definition, speckle_definition)
+          children_changed = false
+          unless definition.nil?
+            # TODO: Here we need to check later if definition invalid or not.
+            previous_speckle_id = definition.get_attribute(SPECKLE_BASE_OBJECT, 'speckle_id')
+            children_changed = previous_speckle_id != speckle_definition['id']
           end
-
-          material = face.material || face.back_material
-          return 'none' if material.nil?
-
-          return material.entityID.to_s
-        end
-
-        def self.attribute_dictionary?(face)
-          any_attribute_dictionary = !(face.attribute_dictionaries.nil? || face.attribute_dictionaries.first.nil?)
-          return any_attribute_dictionary unless any_attribute_dictionary
-
-          # If there are any attribute dictionary, then make sure that they are not ignored ones.
-          all_attribute_dictionary_ignored = face.attribute_dictionaries.all? do |dict|
-            ignored_dictionaries.include?(dict.name)
-          end
-          !all_attribute_dictionary_ignored
-        end
-
-        def self.ignored_dictionaries
-          [
-            'Speckle_Base_Object'
-          ]
+          children_changed
         end
       end
     end

speckle_connector/src/speckle_objects/other/block_instance.rb

@@ -5,7 +5,9 @@ require_relative 'transform'
 require_relative 'block_definition'
 require_relative '../base'
 require_relative '../geometry/bounding_box'
-require_relative '../../sketchup_model/dictionary/dictionary_handler'
+require_relative '../../sketchup_model/dictionary/base_dictionary_handler'
+require_relative '../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+require_relative '../../sketchup_model/query/layer'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -23,8 +25,8 @@ module SpeckleConnector
         # @param sketchup_attributes [Hash{Symbol=>Object}] sketchup attributes of the block instance.
         # @param application_id [String] application id of the block instance.
         # rubocop:disable Metrics/ParameterLists
-        def initialize(units:, is_sketchup_group:, name:, render_material:, transform:, block_definition:,
-                       sketchup_attributes: {}, application_id: nil)
+        def initialize(units:, is_sketchup_group:, name:, render_material:, transform:, block_definition:, layer:,
+                       sketchup_attributes: {}, speckle_schema: {}, application_id: nil)
           super(
             speckle_type: SPECKLE_TYPE,
             total_children_count: 0,
@@ -33,10 +35,12 @@ module SpeckleConnector
           )
           self[:units] = units
           self[:name] = name
+          self[:layer] = layer
           self[:is_sketchup_group] = is_sketchup_group
           self[:renderMaterial] = render_material
           self[:transform] = transform
           self[:sketchup_attributes] = sketchup_attributes if sketchup_attributes.any?
+          self[:SpeckleSchema] = speckle_schema if speckle_schema.any?
           # FIXME: Since blockDefinition sends with @ as detached, block basePlane renders on viewer.
           self['@@definition'] = block_definition
         end
@@ -47,12 +51,10 @@ module SpeckleConnector
           new_speckle_state, block_definition = convert.call(group.definition, preferences, speckle_state,
                                                              group.persistent_id)
           speckle_state = new_speckle_state
-          dictionaries = {}
-          if preferences[:model][:include_entity_attributes] && preferences[:model][:include_group_entity_attributes]
-            dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(group)
-          end
+          dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
+                         .attribute_dictionaries_to_speckle(group, preferences[:model])
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
-
+          speckle_schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.speckle_schema_to_speckle(group)
           block_instance = BlockInstance.new(
             units: units,
             is_sketchup_group: true,
@@ -60,7 +62,9 @@ module SpeckleConnector
             render_material: group.material.nil? ? nil : RenderMaterial.from_material(group.material),
             transform: Other::Transform.from_transformation(group.transformation, units),
             block_definition: block_definition,
+            layer: SketchupModel::Query::Layer.entity_path(group),
             sketchup_attributes: att,
+            speckle_schema: speckle_schema,
             application_id: group.guid
           )
           return speckle_state, block_instance
@@ -77,13 +81,11 @@ module SpeckleConnector
           )
           speckle_state = new_speckle_state
 
-          dictionaries = {}
-          if preferences[:model][:include_entity_attributes] &&
-             preferences[:model][:include_component_entity_attributes]
-            dictionaries = SketchupModel::Dictionary::DictionaryHandler
-                           .attribute_dictionaries_to_speckle(component_instance)
-          end
+          dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
+                         .attribute_dictionaries_to_speckle(component_instance, preferences[:model])
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
+          speckle_schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler
+                           .speckle_schema_to_speckle(component_instance)
 
           block_instance = BlockInstance.new(
             units: units,
@@ -96,7 +98,9 @@ module SpeckleConnector
                              end,
             transform: Other::Transform.from_transformation(component_instance.transformation, units),
             block_definition: block_definition,
+            layer: SketchupModel::Query::Layer.entity_path(component_instance),
             sketchup_attributes: att,
+            speckle_schema: speckle_schema,
             application_id: component_instance.persistent_id.to_s
           )
           return speckle_state, block_instance
@@ -128,7 +132,10 @@ module SpeckleConnector
           definition = state.sketchup_state.sketchup_model
                             .definitions[BlockDefinition.get_definition_name(block_definition)]
 
-          return add_instance_from_definition(state, block, layer, entities, definition, is_group, &convert_to_native)
+          block_layer_name = SketchupModel::Query::Layer.entity_layer_from_path(block['layer'])
+          block_layer = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == block_layer_name }
+          return add_instance_from_definition(state, block, block_layer, layer, entities, definition, is_group,
+                                              &convert_to_native)
         end
 
         def self.get_transform_matrix(block)
@@ -163,18 +170,19 @@ module SpeckleConnector
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/ParameterLists
-        def self.add_instance_from_definition(state, block, layer, entities, definition, is_group, &convert_to_native)
+        def self.add_instance_from_definition(state, block, block_layer, layer, entities, definition, is_group,
+                                              &convert_to_native)
           t_arr = get_transform_matrix(block)
           transform = Other::Transform.to_native(t_arr, block['units'])
           instance = if is_group
                        # rubocop:disable SketchupSuggestions/AddGroup
                        group = entities.add_group(definition.entities.to_a)
-                       group.layer = layer
+                       group.layer = block_layer.nil? ? layer : block_layer
                        group
                        # rubocop:enable SketchupSuggestions/AddGroup
                      else
                        instance = entities.add_instance(definition, transform)
-                       instance.layer = layer
+                       instance.layer = block_layer.nil? ? layer : block_layer
                        instance
                      end
 
@@ -184,8 +192,8 @@ module SpeckleConnector
           puts("Failed to create instance for speckle block instance #{block['id']}") if instance.nil?
           # Transform already applied to instance unless is group
           instance.transformation = transform if is_group
-          state, _materials = Other::RenderMaterial.to_native(state, block['renderMaterial'],
-                                                              layer, entities, &convert_to_native)
+          state, _materials = Other::RenderMaterial.to_native(state, block['renderMaterial'], layer,
+                                                              entities, &convert_to_native)
 
           # Retrieve material from state
           unless block['renderMaterial'].nil?
@@ -196,7 +204,7 @@ module SpeckleConnector
 
           instance.name = block['name'] unless block['name'].nil?
           unless block['sketchup_attributes'].nil?
-            SketchupModel::Dictionary::DictionaryHandler
+            SketchupModel::Dictionary::BaseDictionaryHandler
               .attribute_dictionaries_to_native(instance, block['sketchup_attributes']['dictionaries'])
           end
           return state, [instance, definition]
@@ -206,6 +214,20 @@ module SpeckleConnector
         # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/ParameterLists
+
+        # Instances that created from display value that has no any transform value.
+        # Because of this reason their definition created with origin axis. We basically create transformation
+        # vector between bounds min to origin, to move definition axis to bounds min. Otherwise they looks weird in
+        # sketchup and might be cumbersome when we want to add new entities into definition.
+        # @param instance [Sketchup::ComponentInstance] instance to align axis to it's bounds
+        def self.align_instance_axes(instance)
+          bounds = instance.bounds
+          transform = Geom::Transformation.translation(bounds.min.vector_to(Geom::Point3d.new(0, 0, 0)))
+          entities = instance.definition.entities
+          entities.transform_entities(transform, entities.to_a)
+          instance_transform = instance.transformation
+          instance.transform!(instance_transform * transform.inverse * instance_transform.inverse)
+        end
       end
     end
   end

speckle_connector/src/speckle_objects/other/color.rb

@@ -2,7 +2,7 @@
 
 module SpeckleConnector
   module SpeckleObjects
-    module Others
+    module Other
       # Color object transformations between sketchup and speckle.
       class Color
         # @param color [Sketchup::Color] color to convert speckle object
@@ -16,9 +16,24 @@ module SpeckleConnector
         end
 
         def self.to_native(speckle_color)
+          return from_int(speckle_color) if speckle_color.is_a?(Numeric)
+
           Sketchup::Color.new(speckle_color['red'], speckle_color['green'],
                               speckle_color['blue'], speckle_color['alpha'])
         end
+
+        # @param color [Sketchup::Color] color to convert speckle object
+        # @return [Numeric] int value of the color
+        def self.to_int(color)
+          rgba = color.to_a
+          [rgba[3] << 24 | rgba[0] << 16 | rgba[1] << 8 | rgba[2]].pack('l').unpack1('l').to_i
+        end
+
+        # @param argb [Numeric] int value of the corresponding color
+        # @return [Sketchup::Color] sketchup color
+        def self.from_int(argb)
+          Sketchup::Color.new((argb >> 16) & 255, (argb >> 8) & 255, argb & 255, (argb >> 24) & 255)
+        end
       end
     end
   end

speckle_connector/src/speckle_objects/other/display_style.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'color'
+require_relative '../base'
+require_relative '../../constants/type_constants'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Other
+      # DisplayStyle object for layer.
+      class DisplayStyle < Base
+
+        def initialize(name:, color:, line_type:)
+          super(
+            speckle_type: OBJECTS_OTHER_DISPLAYSTYLE,
+            total_children_count: 0,
+            application_id: nil,
+            id: nil
+          )
+          self[:name] = name
+          self[:color] = color
+          self[:linetype] = line_type unless line_type.nil?
+        end
+
+        # @param layer [Sketchup::Layer] layer to get display style.
+        def self.from_layer(layer)
+          DisplayStyle.new(
+            name: '',
+            color: Color.to_int(layer.color),
+            line_type: layer.line_style.nil? ? nil : layer.line_style.name
+          )
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/other/display_value.rb

@@ -7,7 +7,7 @@ require_relative '../../immutable/immutable'
 require_relative '../../ext/immutable_ruby/hash'
 require_relative '../base'
 require_relative '../geometry/bounding_box'
-require_relative '../../sketchup_model/dictionary/dictionary_handler'
+require_relative '../../sketchup_model/dictionary/base_dictionary_handler'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -22,7 +22,9 @@ module SpeckleConnector
 
           return format_naming_convention([family, type, category, element_id]) unless element_id.nil?
 
-          return "def::#{def_obj['applicationId']}"
+          return "def::#{def_obj['applicationId']}" unless def_obj['applicationId'].nil?
+
+          return "def::#{def_obj['id']}"
         end
 
         def self.format_naming_convention(entries)
@@ -58,17 +60,22 @@ module SpeckleConnector
 
           BlockInstance.find_and_erase_existing_instance(definition, obj['id'], obj['applicationId'])
           t_arr = obj['transform']
-          transform = t_arr.nil? ? Geom::Transformation.new : OTHER::Transform.to_native(t_arr, units)
+          transform = t_arr.nil? ? Geom::Transformation.new : Other::Transform.to_native(t_arr, obj['units'])
           instance = entities.add_instance(definition, transform)
           instance.name = obj['name'] unless obj['name'].nil?
+          instance.layer = layer unless layer.nil?
+          # Align instance axes that created from display value. (without any transform)
+          # BlockInstance.align_instance_axes(instance)
           return state, [instance, definition]
         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/other/render_material.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'color'
 require_relative '../base'
 
 module SpeckleConnector
@@ -38,10 +39,9 @@ module SpeckleConnector
 
         # @param material [Sketchup::Material] material on the Sketchup.
         def self.from_material(material)
-          rgba = material.color.to_a
           RenderMaterial.new(
             name: material.name,
-            diffuse: [rgba[3] << 24 | rgba[0] << 16 | rgba[1] << 8 | rgba[2]].pack('l').unpack1('l'),
+            diffuse: Other::Color.to_int(material.color),
             opacity: material.alpha,
             emissive: -16_777_216,
             metalness: 0,
@@ -65,7 +65,7 @@ module SpeckleConnector
           material = sketchup_model.materials.add(name)
           material.alpha = render_material['opacity']
           argb = render_material['diffuse']
-          material.color = Sketchup::Color.new((argb >> 16) & 255, (argb >> 8) & 255, argb & 255, (argb >> 24) & 255)
+          material.color = Color.from_int(argb)
           new_sketchup_state = state.sketchup_state.with_materials(materials.add_material(name, material))
           return state.with_sketchup_state(new_sketchup_state), [material]
         end

speckle_connector/src/speckle_objects/other/rendering_options.rb

@@ -4,7 +4,7 @@ require_relative 'color'
 
 module SpeckleConnector
   module SpeckleObjects
-    module Others
+    module Other
       # Rendering options for scenes.
       class RenderingOptions
         # @param options [Sketchup::RenderingOptions] rendering options to convert speckle object

speckle_connector/src/speckle_objects/relations/layer.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../other/color'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Relations
+      # Sketchup layer (tag) tree relation.
+      class Layer < Base
+        SPECKLE_TYPE = 'Speckle.Core.Models.Collection'
+
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(name:, visible:, is_folder:, line_style: nil, color: nil, layers_and_folders: [],
+                       application_id: nil)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: application_id,
+            id: nil
+          )
+          self[:name] = name
+          self[:color] = color
+          self[:visible] = visible
+          self[:is_folder] =  is_folder
+          self[:line_style] = line_style unless line_style.nil?
+          self[:collectionType] = 'layer'
+          self[:elements] = layers_and_folders if layers_and_folders.any?
+        end
+        # rubocop:enable Metrics/ParameterLists
+
+        # @param speckle_layer [Object] speckle layer object.
+        # @param folder [Sketchup::Layers, Sketchup::LayerFolder] folder to create layers in it.
+        # @param sketchup_model [Sketchup::Model] sketchup active model.
+        def self.to_native_layer(speckle_layer, folder, sketchup_model)
+          layer = sketchup_model.layers.add_layer(speckle_layer[:name])
+          layer.visible = speckle_layer[:visible] unless speckle_layer[:visible].nil?
+          layer.color = SpeckleObjects::Other::Color.to_native(speckle_layer[:color]) if speckle_layer[:color]
+          if speckle_layer[:line_style]
+            line_style = sketchup_model.line_styles.find { |ls| ls.name == speckle_layer[:line_style] }
+            layer.line_style = line_style unless line_style.nil?
+          end
+          folder.add_layer(layer) if folder.is_a?(Sketchup::LayerFolder)
+        end
+
+        def self.to_native_layer_folder(speckle_layer_folder, folder, sketchup_model)
+          speckle_layers = speckle_layer_folder[:elements].select { |layer_or_fol| layer_or_fol[:elements].nil? }
+
+          speckle_layers.each do |speckle_layer|
+            to_native_layer(speckle_layer, folder, sketchup_model)
+          end
+
+          speckle_folders = speckle_layer_folder[:elements].reject { |layer_or_fol| layer_or_fol[:elements].nil? }
+
+          speckle_folders.each do |speckle_folder|
+            sub_folder = folder.add_folder(speckle_folder[:name])
+            sub_folder.visible = speckle_folder[:visible] unless speckle_folder[:visible].nil?
+            to_native_layer_folder(speckle_folder, sub_folder, sketchup_model)
+          end
+        end
+
+        # @param folder [Sketchup::LayerFolder] sketchup layer folder that might contains other folders and layers.
+        def self.from_folder(folder)
+          layers = folder.layers.collect { |layer| from_layer(layer) }
+          sub_folders = folder.folders.collect { |sub_folder| from_folder(sub_folder) }
+          Layer.new(
+            name: folder.display_name,
+            visible: folder.visible?,
+            is_folder: true,
+            layers_and_folders: layers + sub_folders,
+            application_id: folder.persistent_id
+          )
+        end
+
+        # @param layer [Sketchup::Layer] sketchup layer (tag) that objects can be assigned..
+        def self.from_layer(layer)
+          Layer.new(
+            name: layer.display_name,
+            visible: layer.visible?,
+            is_folder: false,
+            line_style: layer.line_style.nil? ? nil : layer.line_style.name,
+            color: SpeckleObjects::Other::Color.to_speckle(layer.color),
+            application_id: layer.persistent_id
+          )
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/relations/layers.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require_relative 'layer'
+require_relative '../base'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Relations
+      # Sketchup layers (tag) tree relation. The difference between Layer is, this is the top object that holds
+      # properties for all layers or folders, i.e. active layer.
+      class Layers < Base
+        SPECKLE_TYPE = 'Speckle.Core.Models.Collection'
+
+        def initialize(active:, layers:)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: nil,
+            id: nil
+          )
+          self[:active_layer] = active
+          self[:elements] = layers
+        end
+
+        def self.element_to_relation(elements)
+          elements.collect do |element|
+            next unless element['speckle_type'] == SPECKLE_CORE_MODELS_COLLECTION
+
+            is_folder = element['elements'].any? { |e| e['speckle_type'] == SPECKLE_CORE_MODELS_COLLECTION }
+            color = element['color'] || element['displayStyle']['color'] unless element['displayStyle'].nil?
+            Layer.new(
+              name: element['name'],
+              visible: element['visible'],
+              is_folder: is_folder,
+              color: color,
+              layers_and_folders: element_to_relation(element['elements'])
+            )
+          end.compact
+        end
+
+        def self.extract_relations(commit_obj)
+          return nil unless commit_obj['speckle_type'] == SPECKLE_CORE_MODELS_COLLECTION
+
+          elements = element_to_relation(commit_obj['elements'])
+
+          Layers.new(
+            active: commit_obj['active_layer'],
+            layers: elements
+          )
+        end
+
+        def self.to_native(layers_relation, sketchup_model)
+          folder = sketchup_model.layers
+
+          SpeckleObjects::Relations::Layer.to_native_layer_folder(layers_relation, folder, sketchup_model)
+
+          active_layer = folder.to_a.find { |layer| layer.display_name == layers_relation['active_layer'] }
+          sketchup_model.active_layer = active_layer unless active_layer.nil?
+        end
+
+        def self.from_model(sketchup_model)
+          # init with headless layers
+          headless_layers = sketchup_model.layers.layers.collect do |layer|
+            SpeckleObjects::Relations::Layer.from_layer(layer)
+          end
+
+          folders = sketchup_model.layers.folders.collect do |folder|
+            SpeckleObjects::Relations::Layer.from_folder(folder)
+          end
+
+          Layers.new(
+            active: sketchup_model.active_layer.display_name,
+            layers: headless_layers + folders
+          )
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/revit/revit_definition.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../block_definition'
-require_relative '../../base'
+require_relative '../other/block_definition'
+require_relative '../base'
 
 module SpeckleConnector
   module SpeckleObjects
-    module Other
-      module Revit
+    module Revit
+      module Other
         # RevitDefinition for Speckle.
         class RevitDefinition < Base
           SPECKLE_TYPE = OBJECTS_OTHER_REVIT_REVITINSTANCE
@@ -16,14 +16,14 @@ module SpeckleConnector
             type = def_obj['type']
             category = def_obj['category']
 
-            return "#{family}-#{type}-#{category}-#{def_obj['id']}"
+            return "#{family}-#{type}-#{category}-#{def_obj['elementId']}"
           end
 
           def self.to_native(state, definition, layer, entities, &convert_to_native)
             definition_name = get_definition_name(definition)
             definition['name'] = definition_name
             definition['displayValue'] += definition['elements'] unless definition['elements'].nil?
-            BlockDefinition.to_native(state, definition, layer, entities, &convert_to_native)
+            SpeckleObjects::Other::BlockDefinition.to_native(state, definition, layer, entities, &convert_to_native)
           end
         end
       end

speckle_connector/src/speckle_objects/revit/revit_instance.rb

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 
 require_relative 'revit_definition'
-require_relative '../render_material'
-require_relative '../transform'
-require_relative '../block_definition'
-require_relative '../../base'
-require_relative '../../geometry/bounding_box'
-require_relative '../../../sketchup_model/dictionary/dictionary_handler'
+require_relative '../base'
 
 module SpeckleConnector
   module SpeckleObjects
-    module Other
-      module Revit
+    module Revit
+      module Other
         # RevitInstance object definition for Speckle.
         class RevitInstance < Base
           SPECKLE_TYPE = OBJECTS_OTHER_REVIT_REVITINSTANCE
@@ -35,8 +30,12 @@ module SpeckleConnector
             definition = state.sketchup_state.sketchup_model
                               .definitions[RevitDefinition.get_definition_name(block_definition)]
 
-            return BlockInstance.add_instance_from_definition(state, block, layer, entities,
-                                                              definition, false, &convert_to_native)
+            block_layer = state.sketchup_state.sketchup_model.layers.to_a
+                               .find { |l| l.display_name == block['category'] }
+
+            return SpeckleObjects::Other::BlockInstance.add_instance_from_definition(
+              state, block, block_layer, layer, entities, definition, false, &convert_to_native
+            )
           end
         end
       end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative '../../../base'
+require_relative '../../../../constants/type_constants'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Speckle
+      module Core
+        module Models
+          # Collection object that collect other speckle objects under it's elements.
+          class Collection < Base
+            # @param name [String] name of the collection.
+            # @param collection_type [String] type of the collection like, layers, categories etc..
+            # @param elements [Array<Object>] elements of the collection.
+            # @param application_id [String, nil] id of the collection on the model.
+            def initialize(name:, collection_type:, elements: [], application_id: nil)
+              super(
+                speckle_type: SPECKLE_CORE_MODELS_COLLECTION,
+                total_children_count: 0,
+                application_id: application_id,
+                id: nil
+              )
+              self[:name] = name
+              self[:collectionType] = collection_type
+              self[:elements] = elements
+            end
+
+            def self.to_native(state, collection, layer, entities, &convert_to_native)
+              collection_type = collection['collectionType']
+
+              if collection_type.include?('model')
+                ModelCollection.to_native(state, collection, layer, entities, &convert_to_native)
+              else
+                LayerCollection.to_native(state, collection, layer, entities, &convert_to_native)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require_relative 'collection'
+require_relative '../../../../sketchup_model/query/layer'
+require_relative '../../../other/color'
+require_relative '../../../other/display_style'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Speckle
+      module Core
+        module Models
+          # LayerCollection object that collect other speckle objects under it's elements.
+          class LayerCollection < Collection
+            SPECKLE_TYPE = 'Speckle.Core.Models.Collection'
+            # rubocop:disable Metrics/ParameterLists
+            def initialize(name:, visible:, is_folder:, display_style: nil, color: nil, elements: [],
+                           application_id: nil)
+              super(
+                name: name,
+                collection_type: 'layer',
+                elements: elements,
+                application_id: application_id
+              )
+              self[:visible] = visible
+              self[:is_folder] =  is_folder
+              self[:color] = color unless color.nil?
+              self[:displayStyle] = display_style unless display_style.nil?
+            end
+            # rubocop:enable Metrics/ParameterLists
+
+            def self.create_layer_collections(sketchup_model)
+              headless_layers = sketchup_model.layers.layers.collect do |layer|
+                from_layer(layer)
+              end
+
+              folders = sketchup_model.layers.folders.collect do |folder|
+                from_folder(folder)
+              end
+
+              headless_layers + folders
+            end
+
+            # @param folder [Sketchup::LayerFolder] sketchup layer folder that might contains other folders and layers.
+            def self.from_folder(folder)
+              layers = folder.layers.collect { |layer| from_layer(layer) }
+              sub_folders = folder.folders.collect { |sub_folder| from_folder(sub_folder) }
+              LayerCollection.new(
+                name: folder.display_name,
+                visible: folder.visible?,
+                is_folder: true,
+                elements: layers + sub_folders,
+                application_id: folder.persistent_id
+              )
+            end
+
+            # @param layer [Sketchup::Layer] sketchup layer (tag) that objects can be assigned..
+            def self.from_layer(layer)
+              LayerCollection.new(
+                name: layer.display_name,
+                visible: layer.visible?,
+                is_folder: false,
+                display_style: Other::DisplayStyle.from_layer(layer),
+                application_id: layer.persistent_id
+              )
+            end
+
+            # @param entity_layer [Sketchup::Layer] entity layer.
+            # @param collection [Array] collection to search elements for entity's layer.
+            # rubocop:disable Metrics/CyclomaticComplexity
+            def self.get_or_create_layer_collection(entity_layer, collection)
+              folder_path = SpeckleConnector::SketchupModel::Query::Layer.path(entity_layer)
+              entity_layer_path = folder_path + [entity_layer]
+              entity_layer_path.each do |folder|
+                collection_candidate = collection[:elements].find do |el|
+                  next if el.is_a?(Array)
+
+                  el[:speckle_type] == SPECKLE_TYPE && el[:collectionType] == 'layer' &&
+                    el[:name] == folder.display_name
+                end
+                if collection_candidate.nil?
+                  color = folder.respond_to?(:color) ? SpeckleObjects::Other::Color.to_speckle(folder.color) : nil
+                  collection_candidate = LayerCollection.new(
+                    name: folder.display_name, visible: folder.visible?,
+                    is_folder: folder.is_a?(Sketchup::LayerFolder), color: color
+                  )
+                  # Before switching collection with the new one, we should add it to current collection's elements
+                  collection[:elements].append(collection_candidate)
+                end
+                collection = collection_candidate
+              end
+
+              collection
+            end
+            # rubocop:enable Metrics/CyclomaticComplexity
+
+            # @param state [States::State] state of the Speckle application.
+            def self.to_native(state, layer_collection, layer_or_folder, entities, &convert_to_native)
+              sketchup_model = state.sketchup_state.sketchup_model
+              elements = layer_collection['elements']
+              name = layer_collection['name']
+
+              layer = sketchup_model.layers.find { |l| l.display_name == name }
+              layer_or_folder = layer if layer
+
+              elements.each do |element|
+                new_state = convert_to_native.call(state, element, layer_or_folder, entities)
+                state = new_state
+              end
+
+              return state, []
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require_relative 'collection'
+require_relative 'layer_collection'
+require_relative '../../../built_elements/view3d'
+require_relative '../../../built_elements/revit/direct_shape'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Speckle
+      module Core
+        module Models
+          # ModelCollection object that collect other speckle objects under it's elements.
+          class ModelCollection < Collection
+            DIRECT_SHAPE = SpeckleObjects::BuiltElements::Revit::DirectShape
+            VIEW3D = SpeckleObjects::BuiltElements::View3d
+            def initialize(name:, active_layer:, elements: [], application_id: nil)
+              super(
+                name: name,
+                collection_type: 'sketchup model',
+                elements: elements,
+                application_id: application_id
+              )
+              self[:active_layer] = active_layer
+            end
+
+            def self.from_sketchup_model(sketchup_model, speckle_state, units, preferences, &convert)
+              model_collection = ModelCollection.new(
+                name: 'Sketchup Model', active_layer: sketchup_model.active_layer.display_name,
+                application_id: sketchup_model.guid
+              )
+
+              # Direct shapes will pass directly to elements which are already flattened with all children
+              model_collection[:elements] += collect_direct_shapes(sketchup_model, units, preferences)
+
+              # Views will pass directly to elements since they don't have any relation with layers and geometries.
+              model_collection[:elements] += VIEW3D.from_model(sketchup_model, units) if sketchup_model.pages.any?
+
+              # Add layer collections.
+              model_collection[:elements] += LayerCollection.create_layer_collections(sketchup_model)
+
+              sketchup_model.selection.each do |entity|
+                layer_collection = LayerCollection.get_or_create_layer_collection(entity.layer, model_collection)
+                new_speckle_state, converted_object_with_entity = convert.call(entity, preferences, speckle_state)
+                speckle_state = new_speckle_state
+                unless converted_object_with_entity.nil?
+                  layer_collection[:elements] = [] if layer_collection[:elements].nil?
+                  layer_collection[:elements].append(converted_object_with_entity)
+                end
+              end
+
+              return speckle_state, model_collection
+            end
+
+            def self.collect_direct_shapes(sketchup_model, units, preferences)
+              DIRECT_SHAPE.direct_shapes_on_selection(sketchup_model).collect do |entities|
+                entity = entities[0]
+                path = entities[1..-1]
+
+                direct_shape = DIRECT_SHAPE.from_entity(entity, path, units, preferences)
+                [direct_shape, [entity]]
+              end
+            end
+
+            def self.to_native(state, model_collection, layer, entities, &convert_to_native)
+              elements = model_collection['elements']
+
+              elements.each do |element|
+                new_state = convert_to_native.call(state, element, layer, entities)
+                state = new_state
+              end
+
+              active_layer = model_collection['active_layer']
+              state.sketchup_state.sketchup_model.active_layer = active_layer unless active_layer.nil?
+
+              return state, []
+            end
+          end
+        end
+      end
+    end
+  end
+end

speckle_connector/src/states/speckle_state.rb

@@ -14,6 +14,9 @@ module SpeckleConnector
       #  corresponding speckle entity
       attr_reader :speckle_entities
 
+      # @return [ImmutableHash{Integer=>Sketchup::Entity}] persistent_id of the sketchup entity and itself
+      attr_reader :mapped_entities
+
       # @return [Array] accounts on appdata.
       attr_reader :accounts
 
@@ -30,12 +33,23 @@ module SpeckleConnector
       # @return [Relations::ManyToOneRelation] relations between objects.
       attr_accessor :relation
 
+      # TODO: Do cashing later
+      # @return [ImmutableHash{String=>SpeckleObjects::Other::RenderMaterial}] converted render materials
+      attr_accessor :render_materials
+
+      # TODO: Do cashing later
+      # @return [ImmutableHash{String=>SpeckleObjects::Other::BlockDefinition}] converted component definitions
+      attr_accessor :definitions
+
       def initialize(accounts, observers, queue, stream_queue)
         @accounts = accounts
         @observers = observers
         @message_queue = queue
         @stream_queue = stream_queue
         @speckle_entities = Immutable::EmptyHash
+        @mapped_entities = Immutable::EmptyHash
+        @render_materials = Immutable::EmptyHash
+        @definitions = Immutable::EmptyHash
         @relation = Relations::ManyToOneRelation.new
       end
 
@@ -48,6 +62,23 @@ module SpeckleConnector
         with(:@message_queue => new_queue)
       end
 
+      def with_mapped_entities_queue(mapped_entities)
+        new_queue = message_queue.merge({ "mappedEntitiesUpdated":
+                                            "mappedEntitiesUpdated(#{JSON.generate(mapped_entities)})" })
+        with(:@message_queue => new_queue)
+      end
+
+      def with_selection_queue(selection_parameters)
+        new_queue = message_queue.merge({ "entitySelected":
+                                            "entitySelected(#{JSON.generate(selection_parameters)})" })
+        with(:@message_queue => new_queue)
+      end
+
+      def with_deselection_queue
+        new_queue = message_queue.merge({ "entitiesDeselected": 'entitiesDeselected()' })
+        with(:@message_queue => new_queue)
+      end
+
       def with_invalid_streams_queue
         new_queue = message_queue.merge({ "updateInvalidStreams":
                                             "updateInvalidStreams(#{JSON.generate(invalid_streams)})" })
@@ -64,6 +95,16 @@ module SpeckleConnector
         with(:@accounts => new_accounts)
       end
 
+      def with_mapped_entity(entity)
+        new_mapped_entities = mapped_entities.put(entity.persistent_id, entity)
+        with_mapped_entities(new_mapped_entities)
+      end
+
+      def with_removed_mapped_entity(entity)
+        new_mapped_entities = mapped_entities.delete(entity.persistent_id)
+        with_mapped_entities(new_mapped_entities)
+      end
+
       def with_speckle_entity(traversed_entity)
         new_speckle_entities = speckle_entities.put(traversed_entity.application_id, traversed_entity)
         with_speckle_entities(new_speckle_entities)
@@ -73,6 +114,10 @@ module SpeckleConnector
         with(:@speckle_entities => new_speckle_entities)
       end
 
+      def with_mapped_entities(new_mapped_entities)
+        with(:@mapped_entities => new_mapped_entities)
+      end
+
       def with_relation(new_relation)
         with(:@relation => new_relation)
       end

speckle_connector/src/states/state.rb

@@ -36,6 +36,20 @@ module SpeckleConnector
         with(:@speckle_state => new_speckle_state)
       end
 
+      def with_mapped_entities_queue(mapped_entities)
+        new_speckle_state = speckle_state.with_mapped_entities_queue(mapped_entities)
+        with(:@speckle_state => new_speckle_state)
+      end
+
+      def with_selection_queue(selection_parameters)
+        new_speckle_state = if selection_parameters[:selection].any?
+                              speckle_state.with_selection_queue(selection_parameters)
+                            else
+                              speckle_state.with_deselection_queue
+                            end
+        with(:@speckle_state => new_speckle_state)
+      end
+
       def with_empty_stream_queue
         new_speckle_state = speckle_state.with(:@stream_queue => {})
         with(:@speckle_state => new_speckle_state)

speckle_connector/src/ui/vue_view.rb

@@ -14,6 +14,8 @@ require_relative '../commands/notify_connected'
 require_relative '../commands/user_preferences_updated'
 require_relative '../commands/model_preferences_updated'
 require_relative '../commands/activate_diffing'
+require_relative '../commands/apply_mappings'
+require_relative '../commands/clear_mappings'
 
 require_relative '../actions/reload_accounts'
 require_relative '../actions/load_saved_streams'
@@ -21,6 +23,12 @@ require_relative '../actions/init_local_accounts'
 require_relative '../actions/collect_preferences'
 require_relative '../actions/deactivate_diffing'
 require_relative '../actions/collect_versions'
+require_relative '../actions/mapped_entities_updated'
+require_relative '../actions/clear_mappings_from_table'
+require_relative '../actions/isolate_mappings_from_table'
+require_relative '../actions/hide_mappings_from_table'
+require_relative '../actions/select_mappings_from_table'
+require_relative '../actions/show_all_entities'
 
 module SpeckleConnector
   module Ui
@@ -56,6 +64,7 @@ module SpeckleConnector
 
       private
 
+      # rubocop:disable Metrics/MethodLength
       def commands
         @commands ||= {
           dialog_ready: Commands::DialogReady.new(@app),
@@ -72,9 +81,18 @@ module SpeckleConnector
           user_preferences_updated: Commands::UserPreferencesUpdated.new(@app),
           model_preferences_updated: Commands::ModelPreferencesUpdated.new(@app),
           activate_diffing: Commands::ActivateDiffing.new(@app),
-          deactivate_diffing: Commands::ActionCommand.new(@app, Actions::DeactivateDiffing)
+          deactivate_diffing: Commands::ActionCommand.new(@app, Actions::DeactivateDiffing),
+          collect_mapped_entities: Commands::ActionCommand.new(@app, Actions::MappedEntitiesUpdated),
+          apply_mappings: Commands::ApplyMappings.new(@app),
+          clear_mappings: Commands::ClearMappings.new(@app),
+          clear_mappings_from_table: Commands::ActionCommand.new(@app, Actions::ClearMappingsFromTable),
+          isolate_mappings_from_table: Commands::ActionCommand.new(@app, Actions::IsolateMappingsFromTable),
+          hide_mappings_from_table: Commands::ActionCommand.new(@app, Actions::HideMappingsFromTable),
+          select_mappings_from_table: Commands::ActionCommand.new(@app, Actions::SelectMappingsFromTable),
+          show_all_entities: Commands::ActionCommand.new(@app, Actions::ShowAllEntities)
         }.freeze
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

ui/package-lock.json

@@ -14,13 +14,13 @@
         "mixpanel-browser": "^2.45.0",
         "regenerator-runtime": "^0.13.9",
         "register-service-worker": "^1.7.1",
-        "sqlite3": "^5.0.2",
+        "sqlite3": "^5.1.5",
         "v-tooltip": "^2.1.3",
         "vue": "^2.6.11",
         "vue-apollo": "^3.0.0-beta.11",
         "vue-router": "^3.2.0",
         "vue-timeago": "^5.1.3",
-        "vuetify": "^2.4.0"
+        "vuetify": "2.6.10"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~4.5.0",
@@ -22707,9 +22707,9 @@
       "dev": true
     },
     "node_modules/sqlite3": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz",
-      "integrity": "sha512-f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.5.tgz",
+      "integrity": "sha512-7sP16i4wI+yKnGOO2q2ijze7EjQ9US+Vw7DYYwxfFtqNZDGgBcEw0oeDaDvUTq66uJOzVd/z6MkIg+c9erSJKg==",
       "hasInstallScript": true,
       "dependencies": {
         "@mapbox/node-pre-gyp": "^1.0.0",
@@ -25264,9 +25264,9 @@
       }
     },
     "node_modules/vuetify": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.6.tgz",
-      "integrity": "sha512-H4KtxDFmDN8QiTRiGfBySyjMhVaHAJTKB0llGGKZT5jKxtnx9gvEtMWXKtVuRP0NJJP0H6xBPJHNOH7nT18qiQ==",
+      "version": "2.6.10",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.10.tgz",
+      "integrity": "sha512-fgUeRDDCwYkwu6WGEEKGe7IdfzOsXJCZGrqkn1pcS2ycuoDL8mR2/dejH5iFNnBY6MnsT365PAGn0J+9otjfQg==",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/johnleider"
@@ -44593,9 +44593,9 @@
       "dev": true
     },
     "sqlite3": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz",
-      "integrity": "sha512-f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.5.tgz",
+      "integrity": "sha512-7sP16i4wI+yKnGOO2q2ijze7EjQ9US+Vw7DYYwxfFtqNZDGgBcEw0oeDaDvUTq66uJOzVd/z6MkIg+c9erSJKg==",
       "requires": {
         "@mapbox/node-pre-gyp": "^1.0.0",
         "node-addon-api": "^4.2.0",
@@ -46606,9 +46606,9 @@
       }
     },
     "vuetify": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.6.tgz",
-      "integrity": "sha512-H4KtxDFmDN8QiTRiGfBySyjMhVaHAJTKB0llGGKZT5jKxtnx9gvEtMWXKtVuRP0NJJP0H6xBPJHNOH7nT18qiQ==",
+      "version": "2.6.10",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.10.tgz",
+      "integrity": "sha512-fgUeRDDCwYkwu6WGEEKGe7IdfzOsXJCZGrqkn1pcS2ycuoDL8mR2/dejH5iFNnBY6MnsT365PAGn0J+9otjfQg==",
       "requires": {}
     },
     "vuetify-loader": {

ui/package.json

@@ -17,13 +17,13 @@
     "mixpanel-browser": "^2.45.0",
     "regenerator-runtime": "^0.13.9",
     "register-service-worker": "^1.7.1",
-    "sqlite3": "^5.0.2",
+    "sqlite3": "^5.1.5",
     "v-tooltip": "^2.1.3",
     "vue": "^2.6.11",
     "vue-apollo": "^3.0.0-beta.11",
     "vue-router": "^3.2.0",
     "vue-timeago": "^5.1.3",
-    "vuetify": "^2.4.0"
+    "vuetify": "2.6.10"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

ui/src/App.vue

@@ -1,25 +1,26 @@
 <template>
   <v-app>
     <v-main>
-      <v-app-bar app flat>
+      <v-app-bar app flat height="50">
         <v-img
-          class="mx-auto"
+          class="mx-auto px-0"
           max-width="45"
           src="@/assets/logo.svg"
           style="display: inline-block"
         />
-        <v-text-field
-          v-model="streamSearchQuery"
-          prepend-inner-icon="mdi-magnify"
-          label="Search streams"
-          hide-details
-          clearable
-          rounded
-          filled
-          dense
-          flat
-          solo
-        />
+        <v-tabs
+            v-model="tab"
+            align-tabs="title"
+            class="mx-sm-1"
+        >
+          <v-tabs-slider class="mx-sm-1"></v-tabs-slider>
+          <v-tab href="#streams">
+            {{"Streams"}}
+          </v-tab>
+          <v-tab href="#mapper">
+            {{"Mapper"}}
+          </v-tab>
+        </v-tabs>
         <v-spacer />
         <v-btn icon small class="mx-1" @click="requestRefresh">
           <v-icon>mdi-refresh</v-icon>
@@ -80,19 +81,44 @@
         </v-menu>
       </v-app-bar>
 
-      <create-stream-dialog
-          v-if="accounts().length !== 0"
-          :account-id="activeAccount().userInfo.id"
-          :server-url="activeAccount().serverInfo.url"
-      />
-
-      <v-container v-if="accounts().length !== 0" fluid>
-        <router-view :stream-search-query="streamSearchQuery" />
-      </v-container>
-      <v-container v-else>
-        <login/>
-      </v-container>
-      <global-toast />
+      <v-tabs-items v-model="tab">
+        <v-tab-item :key="1" value="streams">
+          <v-container class="ma-0 pa-0">
+            <v-container>
+              <v-text-field
+                  v-model="streamSearchQuery"
+                  prepend-inner-icon="mdi-magnify"
+                  label="Search streams"
+                  background-color="background"
+                  hide-details
+                  clearable
+                  rounded
+                  filled
+                  dense
+                  flat
+                  solo
+              />
+            </v-container>
+            <create-stream-dialog
+                v-if="accounts().length !== 0"
+                :account-id="activeAccount().userInfo.id"
+                :server-url="activeAccount().serverInfo.url"
+            />
+            <v-container v-if="accounts().length !== 0" fluid>
+              <router-view :stream-search-query="streamSearchQuery" />
+            </v-container>
+            <v-container v-else>
+              <login/>
+            </v-container>
+            <global-toast />
+          </v-container>
+        </v-tab-item>
+        <v-tab-item :key="2" value="mapper">
+          <v-card flat>
+            <mapper></mapper>
+          </v-card>
+        </v-tab-item>
+      </v-tabs-items>
     </v-main>
   </v-app>
 </template>
@@ -141,7 +167,8 @@ export default {
     Login,
     CreateStreamDialog: () => import('@/components/dialogs/CreateStreamDialog'),
     SettingsDialog: () => import('@/components/dialogs/SettingsDialog'),
-    GlobalToast: () => import('@/components/GlobalToast')
+    GlobalToast: () => import('@/components/GlobalToast'),
+    Mapper: () => import('@/components/Mapper')
   },
   props: {
     size: {
@@ -155,7 +182,8 @@ export default {
       createNewStreamDialog: false,
       createStreamByIdDialog: false,
       createStreamByIdText: "",
-      preferences: {}
+      preferences: {},
+      tab: "streams"
     }
   },
   computed: {
@@ -219,3 +247,11 @@ export default {
   }
 }
 </script>
+
+<style>
+
+/deep/ .v-toolbar__content {
+  padding: 0px !important;
+}
+
+</style>

ui/src/components/GlobalToast.vue

@@ -34,6 +34,13 @@ export default {
     }
   },
   mounted() {
+    this.$eventHub.$on('success', (args) => {
+      this.snack = true
+      this.color = "green"
+      this.text = args.text
+      this.actionName = args.action ? args.action.name : null
+      this.url = args.action ? args.action.url : null
+    })
     this.$eventHub.$on('notification', (args) => {
       this.snack = true
       this.color = "primary"

ui/src/components/MappedElements.vue

@@ -0,0 +1,308 @@
+<template>
+  <v-container class="pa-0">
+    <v-data-table
+        v-model="categorySelection"
+        class="elevation-1 mb-2"
+        dense
+        expand
+        disable-filtering
+        disable-pagination
+        hide-default-footer
+        hide-default-header
+        item-key="categoryName"
+        :expanded.sync="mappedElementsExpandedIndexes"
+        :headers="mappedElementsHeaders"
+        :items="mappedEntitiesTableData"
+        :mobile-breakpoint="0"
+        show-select
+    >
+        <template #header="{ props: { headers } }">
+            <thead class="v-data-table-header">
+            <tr>
+                <th
+                        v-for="header in headers"
+                        :key="header.value"
+                        :width="header.width"
+                        scope="col"
+                        class="text-center"
+                >
+                    {{ header.text }}
+                </th>
+            </tr>
+            </thead>
+        </template>
+      <template v-slot:expanded-item="{ headers, item }">
+        <td :colspan="headers.length" class="pl-2 pr-0">
+          <v-data-table
+              v-model="elementSelection[item.categoryName]['selectedElements']"
+              class="elevation-0 pa-0 ma-0 mb-2"
+              dense
+              disable-filtering
+              disable-pagination
+              hide-default-footer
+              hide-default-header
+              item-key="entityId"
+              :headers="subMappedElementsHeaders"
+              :items="elementSelection[item.categoryName]['allElements']"
+              :mobile-breakpoint="0"
+              show-select
+          >
+            <template #header="{ props: { headers } }">
+              <thead class="v-data-table-header">
+                <tr>
+                  <th
+                          v-for="header in headers"
+                          :key="header.value"
+                          :width="header.width"
+                          scope="col"
+                          class="text-center"
+                  >
+                      {{ header.text }}
+                  </th>
+                </tr>
+              </thead>
+            </template>
+            <template #[`item.data-table-select`]="slotData">
+              <td class="mapped-elements-check-box-row">
+                <v-checkbox
+                        class="shrink ma-0"
+                        hide-details
+                        :input-value="slotData.isSelected"
+                        @click="slotData.select(clickMappedElements(slotData, item.categoryName))"
+                />
+              </td>
+            </template>
+          </v-data-table>
+        </td>
+      </template>
+
+      <template #[`header.name`]="{ header }">
+          <th class="header-text-color">{{ header.text.toUpperCase() }}</th>
+      </template>
+
+      <template #[`item.categoryName`]="slotData">
+        <div @click="clickMappedElementsCategory(slotData)">{{ slotData.item.categoryName }}</div>
+      </template>
+
+      <template #[`item.data-table-select`]="slotData">
+        <v-checkbox
+                class="shrink ma-0"
+                hide-details
+                :input-value="slotData.isSelected"
+                @click="slotData.select(clickMappedCategory(slotData))"
+        />
+      </template>
+
+    </v-data-table>
+      <v-container class="btn-container px-0">
+        <v-btn
+          v-tooltip="'Clear Mappings'"
+          x-small
+          min-width="30px"
+          min-height="30px"
+          @click="clearMappingsFromTableSelection"
+        >
+          <v-icon left dark>
+              mdi-delete
+          </v-icon>
+            Clear
+        </v-btn>
+
+        <v-spacer></v-spacer>
+
+        <v-btn
+          v-tooltip=" isIsolated ? 'Show All Elements' : 'Isolate Mapped Elements'"
+          x-small
+          min-width="30px"
+          min-height="30px"
+          class="mr-2"
+          @click="isolateMappedElementsOnSketchup"
+        >
+          <v-icon left dark>
+              {{ isIsolated ? 'mdi-crop-rotate' : 'mdi-crop'}}
+          </v-icon>
+          {{ isIsolated ? 'Show All' : 'Isolate'}}
+        </v-btn>
+
+        <v-btn
+          v-tooltip="'Hide Mapped Elements'"
+          x-small
+          min-width="30px"
+          min-height="30px"
+          class="mr-2"
+          @click="hideMappedElementsOnSketchup"
+        >
+          <v-icon left dark>
+            mdi-eye-off
+          </v-icon>
+            Hide
+        </v-btn>
+
+        <v-btn
+          v-tooltip="'Select Mapped Elements'"
+          x-small
+          min-width="30px"
+          min-height="30px"
+          @click="selectMappedElementsOnSketchup"
+        >
+          <v-icon left dark>
+              mdi-select-all
+          </v-icon>
+            Select
+        </v-btn>
+      </v-container>
+  </v-container>
+</template>
+
+<script>
+/*global sketchup*/
+import {bus} from "@/main";
+import {groupBy} from "@/utils/groupBy";
+
+export default {
+  name: "MappedElements",
+  data(){
+    return {
+      isIsolated: false,
+      elementSelection: {},
+      categorySelection: [],
+      mappedEntities: [],
+      mappedEntityCount: 0,
+      // Expanded indexes for mapped element table (Categories)
+      mappedElementsExpandedIndexes: [],
+      mappedElementsHeaders: [
+        { text: 'Category', sortable: false, align: 'center', value: 'categoryName', width: '70%' },
+        { text: 'Count', sortable: false, align: 'center', value: 'count', width: '30%' }
+      ],
+      subMappedElementsHeaders: [
+        { text: 'Type', sortable: false, align: 'center', value: 'entityType', width: '70%' },
+        { text: 'Name/Id', sortable: false, align: 'center', value: 'nameOrId', width: '30%' },
+      ],
+      mappedEntitiesTableData: [],
+    }
+  },
+  computed: {
+    // categorySelection() {
+    //     return Object.keys(this.elementSelection)
+    // },
+  },
+  mounted() {
+    sketchup.exec({name: "collect_mapped_entities", data: {}})
+
+    bus.$on('mapped-entities-updated', async (mappedEntities) => {
+      this.mappedEntityCount = mappedEntities.length
+      this.mappedEntities = mappedEntities
+      this.getMappedElementsTableData()
+    })
+  },
+  methods: {
+    // categorySelection() {
+    //     return Object.keys(this.elementSelection)
+    // },
+    clickMappedElementsCategory(slotData) {
+      const indexExpanded = this.mappedElementsExpandedIndexes.findIndex(i => i === slotData.item);
+      if (indexExpanded > -1) {
+        this.mappedElementsExpandedIndexes.splice(indexExpanded, 1)
+      } else {
+        this.mappedElementsExpandedIndexes.push(slotData.item);
+      }
+    },
+    clickMappedCategory(slotData){
+        const category = this.elementSelection[slotData.item.categoryName]
+        if (category['allSelected'] || category['selectedElements'].length === category['entityCount']) {
+            this.elementSelection[slotData.item.categoryName]['allSelected'] = false
+            this.elementSelection[slotData.item.categoryName]['selectedElements'] = []
+        } else {
+            this.elementSelection[slotData.item.categoryName]['allSelected'] = true
+            this.elementSelection[slotData.item.categoryName]['selectedElements'] = slotData.item.entities
+        }
+    },
+    clickMappedElements(slotData, category){
+        const elements = this.elementSelection[category]['selectedElements'] === undefined ? [] : this.elementSelection[category]['selectedElements']
+        const indexSelection = elements.findIndex(i => i['entityId'] === slotData.item['entityId']);
+        if (indexSelection > -1) {
+            elements.splice(indexSelection, 1)
+        } else {
+            elements.push(slotData.item);
+        }
+        this.elementSelection[category]['selectedElements'] = elements
+        // FIXME: This should be the ideal UX, but there is a problem with states currently.. Need to be fixed
+        // if (elements.length === 0){
+        //     this.elementSelection[category]['allSelected'] = false
+        // }
+    },
+    clearMappingsFromTableSelection(){
+        sketchup.exec({ name: "clear_mappings_from_table", data: this.elementSelection })
+    },
+    isolateMappedElementsOnSketchup(){
+      if (this.isIsolated){
+        this.isIsolated = false
+        sketchup.exec({ name: "show_all_entities", data: {} })
+      } else {
+        this.isIsolated = true
+        sketchup.exec({ name: "isolate_mappings_from_table", data: this.elementSelection })
+      }
+    },
+    hideMappedElementsOnSketchup(){
+        sketchup.exec({ name: "hide_mappings_from_table", data: this.elementSelection })
+    },
+    selectMappedElementsOnSketchup(){
+        sketchup.exec({ name: "select_mappings_from_table", data: this.elementSelection })
+    },
+    // Update mapped elements table whenever mapped elements has changed.
+    getMappedElementsTableData(){
+      let groupByCategoryName = groupBy('categoryName')
+      let groupedByCategoryName = groupByCategoryName(this.mappedEntities)
+      // Reset selected categories and elements whenever mapped elements states has changed
+      this.elementSelection = {}
+      this.categorySelection = []
+      this.mappedElementsExpandedIndexes = []
+      this.mappedEntitiesTableData = Object.entries(groupedByCategoryName).map(
+        (entry) => {
+          const [categoryName, entities] = entry
+          this.elementSelection[categoryName] = {
+              allSelected: false,
+              entityCount: entities.length,
+              selectedElements: [],
+              allElements: entities.map((entity) => {
+                  return {
+                      'entityId': entity['entityId'],
+                      'nameOrId': entity['name'] !== "" ? entity['name'] : entity['entityId'],
+                      'entityType': entity['entityType']
+                  }
+              })
+          }
+          return {
+            'categoryName': categoryName,
+            'count': entities !== true ? entities.length : 0,
+            'entities': entities.map((entity) => {
+              return {
+                'entityId': entity['entityId'],
+                'nameOrId': entity['name'] !== "" ? entity['name'] : entity['entityId'],
+                'entityType': entity['entityType']
+              }
+            })
+          }
+        }
+      )
+    },
+  }
+}
+</script>
+
+<style scoped>
+.btn-container{
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.mapped-elements-check-box-row {
+    width: 20px;
+}
+
+/* This is the header styles of child table */
+.v-data-table--dense > .v-data-table__wrapper > table > thead > tr > th {
+    height: 32px;
+}
+
+</style>

ui/src/components/Mapper.vue

@@ -0,0 +1,571 @@
+<template>
+  <v-container fluid class="px-3 btn-container">
+    <v-expansion-panels
+      v-model="panel"
+      accordion
+      multiple
+    >
+      <v-expansion-panel key="selection">
+        <v-expansion-panel-header>
+          <div>
+            <v-icon>
+              {{ selectedEntityCount === 0 ? 'mdi-playlist-remove' : 'mdi-playlist-check' }}
+            </v-icon>
+            {{ `Selection (${selectedEntityCount})` }}
+          </div>
+        </v-expansion-panel-header>
+        <v-expansion-panel-content class="mx-n3">
+          <v-data-table
+              class="elevation-1"
+              dense
+              expand
+              disable-filtering
+              disable-pagination
+              hide-default-footer
+              item-key="entityType"
+              :expanded.sync="selectionExpandedIndexes"
+              :headers="selectionHeaders"
+              :items="selectionTableData"
+              :mobile-breakpoint="0"
+          >
+            <template v-slot:expanded-item="{ headers, item }">
+              <td :colspan="headers.length" class="pl-2 pr-0">
+                <v-data-table
+                    class="elevation-0 pa-0 ma-0"
+                    dense
+                    disable-filtering
+                    disable-pagination
+                    hide-default-footer
+                    item-key="entityId"
+                    :headers="subSelectionHeaders"
+                    :items="item.entities"
+                    :mobile-breakpoint="0"
+                >
+                  <template v-slot:item.isMapped="{ item }">
+                    <v-icon :color="item.isMapped ? 'green' : 'red'">
+                      {{ item.isMapped ? 'mdi-check-circle' : 'mdi-close-circle' }}
+                    </v-icon>
+                  </template>
+
+                </v-data-table>
+              </td>
+            </template>
+            <template v-slot:item.entityType="slotData">
+              <div @click="clickSelectionColumn(slotData)">{{ slotData.item.entityType }}</div>
+            </template>
+          </v-data-table>
+
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+
+      <v-expansion-panel key="mapping">
+        <v-expansion-panel-header>
+          <div>
+            <v-icon>
+              mdi-multiplication
+            </v-icon>
+            {{ `Mapping` }}
+          </div>
+        </v-expansion-panel-header>
+        <v-expansion-panel-content>
+          <v-container v-if="entitySelected" class="btn-container pa-0 mb-5">
+            <v-card
+                variant="outlined"
+                class="pt-0 pl-2 mb-1 mr-2 flex"
+                :elevation="entityCardElevation"
+                :outlined="!definitionSelected"
+                :width="entityCardWidth"
+                min-width="150px"
+                @click="definitionSelectedHandler(false)"
+            >
+              <v-card-title class="pa-0 pb-2">
+                <v-icon class="mr-1 v-bottom-navigation--absolute">
+                  {{ getSelectedEntityIcon }}
+                </v-icon>
+                {{getSelectedEntityText}}
+                <v-spacer></v-spacer>
+                <v-icon v-if="entityMapped" class="mr-n2 mt-n6" color="green">
+                  mdi-checkbox-marked-circle
+                </v-icon>
+              </v-card-title>
+              <v-card-subtitle class="pb-0 pr-0 font-weight-light">
+                {{getSelectedEntitySubText}}
+              </v-card-subtitle>
+            </v-card>
+
+            <v-card
+                v-if=selectedEntitiesHasParent
+                variant="outlined"
+                class="pt-0 pl-2 mb-1 mr-2 flex"
+                :elevation="definitionSelected ? '6' : '1'"
+                :outlined="definitionSelected"
+                :width="entityCardWidth"
+                min-width="150px"
+                @click="definitionSelectedHandler(true)"
+            >
+              <v-card-title class="pa-0 pb-2">
+                <v-icon class="mr-1">
+                  mdi-atom
+                </v-icon>
+                {{ getSelectedDefinitionText }}
+                <v-spacer></v-spacer>
+                <v-icon v-if="definitionMapped" class="mr-n2 mt-n6" color="green">
+                  mdi-checkbox-marked-circle
+                </v-icon>
+              </v-card-title>
+              <v-card-subtitle class="pb-0 pr-0 font-weight-light">
+                {{getSelectedDefinitionSubText}}
+              </v-card-subtitle>
+            </v-card>
+          </v-container>
+
+          <v-autocomplete
+              v-model="selectedMethod"
+              class="pt-0"
+              label="Mapper Method"
+              :disabled="!entitySelected"
+              :items="enabledMethods"
+              density="compact"
+              clearable
+          ></v-autocomplete>
+
+          <v-autocomplete
+              v-model="selectedCategory"
+              class="pt-0"
+              label="Category"
+              :items="availableCategories"
+              item-value="value"
+              item-text="key"
+              :disabled="!entitySelected"
+              density="compact"
+              clearable
+          ></v-autocomplete>
+
+          <v-text-field
+              v-model="name"
+              class="pt-0"
+              label="Name"
+              :disabled="!entitySelected"
+              clearable
+          ></v-text-field>
+
+          <v-container class="pa-0">
+            <v-row justify="center" align="center">
+              <v-col cols="auto" class="pa-1 pb-2">
+                <v-btn
+                    :disabled="!entitySelected"
+                    @click="applyMapping"
+                >
+                  <v-icon dark left>
+                    mdi-checkbox-marked-circle
+                  </v-icon>Apply
+                </v-btn>
+              </v-col>
+              <v-col cols="auto" class="pa-1 pb-2">
+                <v-btn
+                    :disabled="!entitySelected"
+                    @click="clearMapping"
+                >
+                  <v-icon dark left>
+                    mdi-close-circle
+                  </v-icon>Clear
+                </v-btn>
+              </v-col>
+            </v-row>
+
+
+          </v-container>
+
+
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+
+      <v-expansion-panel key="mappedElements">
+        <v-expansion-panel-header>
+          <div>
+            <v-icon>
+              {{ mappedEntityCount === 0 ? 'mdi-playlist-remove' : 'mdi-playlist-check' }}
+            </v-icon>
+            {{ `Mapped Elements (${mappedEntityCount})` }}
+          </div>
+        </v-expansion-panel-header>
+        <v-expansion-panel-content class="mx-n3">
+          <mapped-elements/>
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+
+    </v-expansion-panels>
+
+    <global-toast />
+  </v-container>
+</template>
+
+<script>
+/*global sketchup*/
+import {bus} from "@/main";
+import {groupBy} from "@/utils/groupBy";
+
+global.entitySelected = function (selectionParameters) {
+  bus.$emit('entities-selected', JSON.stringify(selectionParameters))
+}
+
+global.entitiesDeselected = function () {
+  bus.$emit('entities-deselected')
+}
+
+global.mappedEntitiesUpdated = function (mappedEntities) {
+  bus.$emit('mapped-entities-updated', mappedEntities)
+}
+
+export default {
+  name: "Mapper",
+  components: {
+    GlobalToast: () => import('@/components/GlobalToast'),
+    MappedElements: () => import('@/components/MappedElements.vue')
+  },
+  data() {
+    return {
+      // Expanded indexes for selection table (Types)
+      selectionExpandedIndexes: [],
+      // Expanded indexes for mapped element table (Categories)
+      mappedElementsExpandedIndexes: [],
+      // Whether definition card is selected to map or not.
+      definitionSelected: false,
+      // Initial entity (Group, Component, Face, Edge) that mapped or not
+      entityMapped: false,
+      // Definition of entity is mapped, it will be available for only Components.
+      definitionMapped: false,
+      // Whether an entity is selected or not.
+      entitySelected: false,
+      selectedEntityCount: 0,
+      selectedEntities: [],
+      lastSelectedEntity: null,
+      selectedMethod: null,
+      selectedCategory: null,
+      name: "",
+      enabledMethods: [],
+      availableCategories: [],
+      mappedEntityCount: 0,
+      mappedEntities: [],
+      panel: [1],
+      selectionHeaders: [
+        { text: 'Type', sortable: false, value: 'entityType', width: '60%' },
+        { text: 'Count', sortable: false, align: 'center', value: 'count', width: '20%' },
+        { text: 'Mapped', sortable: false, align: 'center', value: 'mappedCount', width: '20%' },
+      ],
+      subSelectionHeaders: [
+        { text: 'Name/Id', sortable: false, value: 'nameOrId', width: '80%' },
+        { text: 'Mapped', sortable: false, align: 'center', value: 'isMapped', width: '20%' },
+      ],
+      mappedElementsHeaders: [
+        { text: 'Category', sortable: false, value: 'categoryName', width: '80%' },
+        { text: 'Count', sortable: false, align: 'center', value: 'count', width: '20%' }
+      ],
+      subMappedElementsHeaders: [
+        { text: 'Type', sortable: false, value: 'entityType', width: '80%' },
+        { text: 'Name/Id', sortable: false, align: 'center', value: 'nameOrId', width: '20%' },
+      ],
+      selectionTableData: [],
+      mappedEntitiesTableData: [],
+    }
+  },
+  computed:{
+    lastSelectedEntityHasParent(){
+      return this.lastSelectedEntity['entityType'] === 'Component'
+    },
+    selectedEntitiesHasParent(){
+      return this.selectedEntities.every((entity) => entity['entityType'] === 'Component')
+    },
+    entityCardWidth(){
+      if (this.lastSelectedEntityHasParent){
+        return '150px'
+      } else {
+        return '310px'
+      }
+    },
+    entityCardElevation(){
+      if (!this.lastSelectedEntityHasParent){
+        return '1'
+      }
+      return this.definitionSelected ? '1' : '6'
+    },
+    entityCardColor(){
+      if (!this.lastSelectedEntityHasParent){
+        return 'background2'
+      }
+      return this.definitionSelected ? 'background2' : 'mappingEntity'
+    },
+    getSelectedEntityIcon(){
+      if (this.selectedEntities.length > 1){
+        return 'mdi-webpack'
+      }else{
+        const type = this.lastSelectedEntity['entityType']
+        if (type === 'Face'){
+          return 'mdi-vector-square'
+        } else if (type === 'Edge'){
+          return 'mdi-vector-polyline'
+        } else if (type === 'Group'){
+          return 'mdi-border-outside'
+        } else if (type === 'Component'){
+          return 'mdi-border-inside'
+        } else {
+          return 'mdi-close'
+        }
+      }
+    },
+    getSelectedEntityText(){
+      if (this.selectedEntities.length > 1){
+        if (this.selectedEntitiesHasParent){
+          return 'Component'
+        }
+        return 'Multiple Selection'
+      }else{
+        return this.lastSelectedEntity["entityType"]
+      }
+    },
+    getSelectedDefinitionText(){
+      if (this.selectedEntities.length > 1 && this.selectedEntitiesHasParent){
+        return 'Definition'
+      }else{
+        return 'Definition'
+      }
+    },
+    getSelectedEntitySubText(){
+      if (this.selectedEntities.length > 1){
+        return this.getSelectionSummary()
+      }else{
+        return 'Single selected entity'
+      }
+    },
+    getSelectedDefinitionSubText(){
+        if (this.selectedEntities.length > 1){
+            let instances = 0
+            let registeredDefinitions = []
+            this.selectedEntities.forEach((entity) => {
+                if (!registeredDefinitions.includes(entity['definition']['entityId'])){
+                    instances += entity['definition']['numberOfInstances']
+                    registeredDefinitions.push(entity['definition']['entityId'])
+                }
+            })
+            return `Instances (${instances})`
+        }else{
+            return `Instances (${this.lastSelectedEntity['definition']['numberOfInstances']})`
+        }
+    }
+  },
+  methods:{
+    clearInputs(){
+      this.enabledMethods = []
+      this.availableCategories = []
+      this.selectedEntities = []
+      this.selectionTableData = []
+      this.selectedEntityCount = 0
+      this.name = ""
+      this.selectedMethod = null
+      this.selectedCategory = null
+      this.entityMapped = false
+      this.definitionMapped = false
+    },
+    getSelectionTableData(){
+      let groupByClass = groupBy('entityType')
+      let groupedByWithKey = groupByClass(this.selectedEntities)
+      this.selectionTableData = Object.entries(groupedByWithKey).map(
+          (entry) => {
+            const [className, entities] = entry
+            return {
+              'entityType': className,
+              'entityIds': entities.map(entity => entity['entityId']),
+              'count': entities !== true ? entities.length : 0,
+              'entities': entities.map((entity) => {
+                return {
+                  'entityId': entity['entityId'],
+                  'nameOrId': entity['name'] !== null ? entity['name'] : entity['entityId'],
+                  'isMapped': this.isEntityMapped(entity) || this.isEntityDefinitionMapped(entity)
+                }
+              }),
+              'mappedCount': entities.filter((entity) => entity['schema']['category'] !== undefined).length
+            }
+          }
+      )
+    },
+    getSelectionSummary(){
+      let groupByClass = groupBy('entityType')
+      let groupedByWithKey = groupByClass(this.selectedEntities)
+      let summary = ''
+      Object.entries(groupedByWithKey).forEach((entry, index) => {
+        const [className, entities] = entry
+          const entityType = className === 'Component' ? 'Instance' : className
+        summary += `${entityType}s (${entities.length})`
+        if (index !== Object.entries(groupedByWithKey).length - 1){
+          summary += ' - '
+        }
+      })
+      return summary
+    },
+    setInputValuesFromSelection(){
+      if (!this.entitySelected){
+        this.name = ""
+        this.selectedMethod = null
+        this.selectedCategory = null
+        return
+      }
+      if (this.definitionSelected) {
+        if (!this.definitionMapped){
+          if (this.selectedEntityCount > 1){
+            this.name = '<Mixed>'
+          }else{
+            this.name = this.lastSelectedEntity['definition']['entityName']
+          }
+          this.selectedMethod = 'Direct Shape'
+          this.selectedCategory = 49
+        } else {
+          if (this.selectedEntityCount > 1){
+            this.name = '<Mixed>'
+          }else{
+            this.name = this.lastSelectedEntity['definition']['schema']['name']
+          }
+          this.selectedMethod = this.lastSelectedEntity['definition']['schema']['method']
+          this.selectedCategory = this.lastSelectedEntity['definition']['schema']['category']
+        }
+      } else {
+        if (!this.entityMapped){
+          if (this.selectedEntityCount > 1){
+            this.name = '<Mixed>'
+          }else{
+            this.name = this.lastSelectedEntity['entityName']
+          }
+          this.selectedMethod = 'Direct Shape'
+          this.selectedCategory = 49
+        } else {
+          if (this.selectedEntityCount > 1){
+            this.name = '<Mixed>'
+          }else{
+            this.name = this.lastSelectedEntity['schema']['name']
+          }
+          this.selectedMethod = this.lastSelectedEntity['schema']['method']
+          this.selectedCategory = this.lastSelectedEntity['schema']['category']
+        }
+      }
+    },
+    isEntityMapped(entity){
+      return entity['schema']['category'] !== undefined
+    },
+    isEntitiesMapped(entities){
+      return entities.every((entity) => this.isEntityMapped(entity))
+    },
+    isEntityDefinitionMapped(entity){
+      if (entity['definition'] === undefined){
+        return false
+      }
+      return entity['definition']['schema']['category'] !== undefined
+    },
+    isEntityDefinitionsMapped(entities){
+      return entities.every((entity) => this.isEntityDefinitionMapped(entity))
+    },
+    definitionSelectedHandler(state){
+      this.definitionSelected = state
+      this.setInputValuesFromSelection()
+    },
+    clickSelectionColumn(slotData) {
+      const indexExpanded = this.selectionExpandedIndexes.findIndex(i => i === slotData.item);
+      if (indexExpanded > -1) {
+        this.selectionExpandedIndexes.splice(indexExpanded, 1)
+      } else {
+        this.selectionExpandedIndexes.push(slotData.item);
+      }
+    },
+    clickMappedElementsColumn(slotData) {
+      const indexExpanded = this.mappedElementsExpandedIndexes.findIndex(i => i === slotData.item);
+      if (indexExpanded > -1) {
+        this.mappedElementsExpandedIndexes.splice(indexExpanded, 1)
+      } else {
+        this.mappedElementsExpandedIndexes.push(slotData.item);
+      }
+    },
+    applyMapping(){
+      if (this.selectedMethod === null || this.selectedCategory === null){
+        this.$eventHub.$emit('error', {
+          text: 'Method and category are not set.\n'
+        })
+        return
+      }
+      const mapping = {
+        entitiesToMap: this.selectedEntities.map((entity) => entity['entityId']),
+        method: this.selectedMethod,
+        category:  this.selectedCategory,
+        name: this.name,
+        isDefinition: this.definitionSelected
+      }
+      sketchup.exec({name: "apply_mappings", data: mapping})
+      this.$eventHub.$emit('success', {
+        text: 'Mapping Applied.\n'
+      })
+    },
+    clearMapping(){
+      const mapping = {
+        entitiesToClearMap: this.selectedEntities.map((entity) => entity['entityId']),
+        isDefinition: this.definitionSelected
+      }
+      sketchup.exec({name: "clear_mappings", data: mapping})
+      this.clearInputs()
+      this.$eventHub.$emit('error', {
+        text: 'Mapping Cleared.\n'
+      })
+    }
+  },
+  mounted() {
+    sketchup.exec({name: "collect_mapped_entities", data: {}})
+
+    bus.$on('entities-selected', async (selectionParameters) => {
+      const selectionPars = JSON.parse(selectionParameters)
+      this.enabledMethods = selectionPars.mappingMethods
+      this.availableCategories = selectionPars.categories
+      this.selectedEntities = selectionPars.selection
+      this.lastSelectedEntity = this.selectedEntities[this.selectedEntities.length - 1]
+      this.entityMapped = this.isEntitiesMapped(this.selectedEntities)
+      this.definitionMapped = this.isEntityDefinitionsMapped(this.selectedEntities)
+      this.definitionSelected = !this.entityMapped && this.definitionMapped
+      this.selectedEntityCount = this.selectedEntities.length
+      this.entitySelected = this.selectedEntityCount !== 0
+      this.getSelectionTableData()
+      this.setInputValuesFromSelection()
+    })
+    bus.$on('entities-deselected', async () => {
+      this.entitySelected = false
+      this.clearInputs()
+    })
+    bus.$on('mapped-entities-updated', async (mappedEntities) => {
+      this.mappedEntityCount = mappedEntities.length
+    })
+  }
+}
+</script>
+
+<style scoped>
+.btn-container{
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.active .entity {
+  border: 2px solid green;
+}
+
+.v-card__title{
+    font-size: 1.02rem;
+}
+
+.v-card__subtitle{
+    font-size: 0.78rem;
+}
+
+.v-expansion-panel--active > .v-expansion-panel-header{
+    min-height: 32px;
+}
+
+.v-expansion-panel-header{
+    min-height: 32px;
+    padding: 12px 16px;
+}
+
+</style>

ui/src/components/dialogs/CreateStreamDialog.vue

@@ -1,13 +1,13 @@
 <template>
-  <v-container fluid class="px-1 pb-0 pt-1">
+  <v-container fluid class="px-1 pb-0 pt-0">
     <v-row>
-      <v-col>
+      <v-col class="py-2">
         <!-- DIALOG: Create New Stream -->
         <v-dialog v-model="showCreateNewStream">
           <template #activator="{ on, attrs }">
             <v-btn
                 class="ma-2 pa-3"
-                x-small
+                small
                 v-bind="attrs"
                 v-on="on"
             >
@@ -96,7 +96,7 @@
           <template #activator="{ on, attrs }">
             <v-btn
                 class="ma-2 pa-3"
-                x-small
+                small
                 min-width="163"
                 v-bind="attrs"
                 v-on="on"

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()
 

ui/src/plugins/vuetify.js

@@ -11,6 +11,7 @@ export default new Vuetify({
         primary: '#0480FB', //speckle blue
         secondary: '#01D1FD', //spark blue
         accent: '#46B958', //data yellow
+        mappingEntity: '#B9d8b5',
         error: '#FF5555', //red
         warning: '#D8BF16', //lightning yellow
         info: '#2D2ADA', //majestic blue
@@ -24,6 +25,7 @@ export default new Vuetify({
         primary: '#0480FB', //speckle blue
         secondary: '#01D1FD', //spark blue
         accent: '#46B958', //data yellow
+        mappingEntity: '#46B958',
         error: '#FF5555', //red
         warning: '#D8BF16', //lightning yellow
         info: '#2D2ADA', //majestic blue

ui/src/scss/styles.css

@@ -119,3 +119,23 @@
   opacity: 1;
   transition: opacity 0.15s;
 }
+
+/* SCROOL BAR */
+::-webkit-scrollbar {
+  width: 12px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f3f3f3;
+  border-left: 1px solid #dadada;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #b0b0b0;
+  border: solid 3px #e6e6e6;
+  border-radius: 7px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: black;
+}

ui/src/utils/groupBy.js

@@ -0,0 +1,13 @@
+/*
+ * Group by function definition to call it on demand.
+ * @example
+ *   const groupByBrand = groupBy('brand')
+ *   const groupedByBrands1 = groupByBrand(array1)
+ *   const groupedByBrands2 = groupByBrand(array2)
+ */
+export const groupBy = key => array =>
+    array.reduce((objectsByKeyValue, obj) => {
+        const value = obj[key];
+        objectsByKeyValue[value] = (objectsByKeyValue[value] || []).concat(obj);
+        return objectsByKeyValue;
+    }, {});