Fix (Config): Reset configs if configSketchup somehow corrupted

- Previously it was assuming views arrive in elements of collection

.circleci/config.yml

@@ -76,6 +76,99 @@ jobs:
           paths:
             - speckle-sharp-ci-tools/Installers
 
+  build-connector-mac:
+    macos:
+      xcode: 12.5.1
+    parameters:
+      projname:
+        type: string
+        default: ""
+      slug:
+        type: string
+        default: ""
+      installer:
+        type: boolean
+        default: false
+      converter-files:
+        type: string
+        default: ""
+      installername:
+        type: string
+        default: ""
+      build-config:
+        type: string
+        default: Release
+      bundlename:
+        type: string
+        default: ""
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Install dotnet
+          command: |
+            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel Current
+
+            $HOME/.dotnet/dotnet --version
+            $HOME/.dotnet/dotnet --list-runtimes
+            $HOME/.dotnet/dotnet --list-sdks
+      - run:
+          name: Create installer target dir
+          command: |
+            mkdir -p speckle-sharp-ci-tools/Installers/<< parameters.slug >>
+      - run:
+          name: Set Environment Variable
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            VER=$(echo "$SEMVER" | sed -e 's/-.*//')
+            VERSION=$(echo $VER.$WORKFLOW_NUM)
+            python3 patch_version.py $SEMVER
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - run:
+          name: Zip Connector files
+          command: |
+            zip -r << parameters.slug >>-mac.zip "./speckle_connector" "./speckle_connector.rb"
+            # Copy installer files
+      - run:
+          name: Copy files to installer
+          command: |
+                  mkdir -p speckle-sharp-ci-tools/Mac/<< parameters.installername >>/.installationFiles/
+                  cp << parameters.slug >>-mac.zip speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles
+      # Create installer
+      - run:
+          name: Exit if External PR
+          command: if [ "$CIRCLE_PR_REPONAME" ]; then circleci-agent step halt; fi
+      - run:
+          name: Build Mac installer
+          command: ~/.dotnet/dotnet publish speckle-sharp-ci-tools/Mac/<<parameters.installername>>/<<parameters.installername>>.sln -r osx-x64 -c Release
+      - run:
+          name: Zip installer
+          command: |
+            cd speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/
+            zip -r <<parameters.slug>>.zip ./
+      - store_artifacts:
+          path: speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip
+      - run:
+          name: Copy to installer location
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            VER=$(echo "$SEMVER" | sed -e 's/-.*//')
+            VERSION=$(echo $VER.$WORKFLOW_NUM)
+            cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<<parameters.slug>>-$SEMVER.zip
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - when:
+          condition: << pipeline.git.tag >>
+          steps:
+            - persist_to_workspace:
+                root: ./
+                paths:
+                  - speckle-sharp-ci-tools/Installers
+  
   get-ci-tools: # Clones our ci tools and persists them to the workspace
     docker:
       - image: cimg/base:2021.01
@@ -99,6 +192,7 @@ jobs:
           root: ./
           paths:
             - speckle-sharp-ci-tools
+
   deploy-manager2:
     docker:
       - image: mcr.microsoft.com/dotnet/sdk:6.0
@@ -146,17 +240,37 @@ workflows:
               only: /.*/
           context: innosetup
 
+      - build-connector-mac:
+          slug: sketchup
+          requires:
+            - get-ci-tools
+            - build-ui
+          filters:
+            tags:
+              only: /.*/
+          installername: SpeckleSketchUpInstall
+
       - deploy-manager2:
           context: do-spaces-speckle-releases
           slug: sketchup
           os: Win
           extension: exe
           requires:
-            - get-ci-tools
-            - build-ui
             - build-connector
           filters:
             tags:
               only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
             branches:
               ignore: /.*/ # For testing only! /ci\/.*/
+      - deploy-manager2:
+          context: do-spaces-speckle-releases
+          slug: sketchup
+          os: OSX
+          extension: zip
+          requires:
+            - build-connector-mac
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/ # For testing only! /ci\/.*/

speckle_connector/bootstrap.rb

@@ -3,6 +3,7 @@
 require 'sketchup'
 require 'pathname'
 require 'speckle_connector/debug'
+require_relative 'src/log/log'
 require_relative 'src/ui/sketchup_ui'
 require_relative 'src/ui/ui_controller'
 require_relative 'src/commands/menu_command_handler'

speckle_connector/src/actions/apply_mappings.rb

@@ -9,12 +9,16 @@ module SpeckleConnector
   module Actions
     # Apply mappings for selected entities.
     class ApplyMappings < Action
-      def initialize(entities_to_map, method, category, name, is_definition)
+      def initialize(entities_to_map, method, category, family,
+                     family_type, level, name, is_definition)
         super()
         @entities_to_map = entities_to_map
         @method = method
         @category = category
         @name = name
+        @family = family
+        @family_type = family_type
+        @level = level
         @is_definition = is_definition
       end
 
@@ -51,6 +55,9 @@ module SpeckleConnector
           SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :category, @category)
           SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :name, name)
           SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :method, @method)
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :family, @family)
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :family_type, @family_type)
+          SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.set_attribute(entity, :level, @level)
           speckle_state = speckle_state.with_mapped_entity(entity)
         end
 

speckle_connector/src/actions/clear_mapper_source.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Clear mapper source.
+    class ClearMapperSource < 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)
+        new_speckle_state = state.speckle_state.with_removed_mapper_source
+        erase_levels(state)
+        state.with_speckle_state(new_speckle_state)
+      end
+
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      def self.erase_levels(state)
+        levels = state.sketchup_state.sketchup_model.definitions.select do |definition|
+          SketchupModel::Dictionary::SpeckleEntityDictionaryHandler.get_attribute(definition, :speckle_type) ==
+            OBJECTS_BUILTELEMENTS_REVIT_LEVEL
+        end
+        levels.each do |level|
+          level.entities.clear!
+          level.instances.each(&:erase!)
+        end
+      end
+    end
+  end
+end

speckle_connector/src/actions/events/selection_event_action.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
 
 require_relative 'event_action'
-require_relative '../../mapping/category/revit_category'
+require_relative '../mapper_selection_changed'
+require_relative '../../mapper/category/revit_category'
 require_relative '../../sketchup_model/reader/speckle_entities_reader'
+require_relative '../../sketchup_model/reader/mapper_reader'
 require_relative '../../sketchup_model/query/entity'
 
 module SpeckleConnector
   module Actions
     module Events
-      # Update selected speckle objects when the selection changes for mapping tool.
+      # Update selected speckle objects when the selection changes for mapper 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?
 
+          # Get sketchup selection
           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)
+          # Collect and return mapper selection info.
+          # Later we can add more selection info for different scopes.
+          MapperSelectionChanged.new(sketchup_selection).update_state(state)
         end
       end
     end

speckle_connector/src/actions/hide_mappings_from_table.rb

@@ -21,6 +21,11 @@ module SpeckleConnector
         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
 

speckle_connector/src/actions/isolate_mappings_from_table.rb

@@ -11,6 +11,7 @@ module SpeckleConnector
       # @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)
@@ -24,14 +25,15 @@ module SpeckleConnector
         # 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)
+        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'] == 'Group'
+          e['entityType'] == 'Component' || e['entityType'] == 'Definition' || e['entityType'] == 'Group'
         end
 
         faces_or_edges_ids = faces_or_edges.collect { |e| e['entityId'] }
@@ -43,12 +45,18 @@ module SpeckleConnector
         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

speckle_connector/src/actions/load_sketchup_model.rb

@@ -3,6 +3,7 @@
 require_relative 'action'
 require_relative 'initialize_materials'
 require_relative '../sketchup_model/reader/speckle_entities_reader'
+require_relative '../sketchup_model/reader/mapper_reader'
 require_relative '../preferences/preferences'
 require_relative '../states/state'
 require_relative '../states/sketchup_state'
@@ -29,7 +30,7 @@ module SpeckleConnector
         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_mapped_entities = SketchupModel::Reader::MapperReader.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)
 

speckle_connector/src/actions/mapped_entities_updated.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-require_relative '../sketchup_model/reader/speckle_entities_reader'
+require_relative '../sketchup_model/reader/mapper_reader'
 
 module SpeckleConnector
   module Actions
@@ -10,8 +10,8 @@ module SpeckleConnector
       # @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)
+        mapped_entities = SketchupModel::Reader::MapperReader
+                          .mapped_entity_details(state.speckle_state.speckle_mapper_state.mapped_entities.values.to_a)
 
         state.with_mapped_entities_queue(mapped_entities)
       end

speckle_connector/src/actions/mapper_selection_changed.rb

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative '../mapper/category/revit_category'
+require_relative '../sketchup_model/reader/mapper_reader'
+require_relative '../sketchup_model/reader/speckle_entities_reader'
+require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
+
+module SpeckleConnector
+  module Actions
+    # Collects mapper selection info.
+    class MapperSelectionChanged < Action
+      READER = SketchupModel::Reader
+      DICTIONARY = SketchupModel::Dictionary
+
+      def initialize(selection)
+        super()
+        @selection = selection
+      end
+
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def update_state(state)
+        # Get mapping info from selection.
+        mapping = get_mapping_info(state, @selection)
+
+        state.with_mapper_selection_queue(mapping)
+      end
+
+      def filter_out_levels(selection)
+        selection.reject do |e|
+          DICTIONARY::SpeckleEntityDictionaryHandler
+            .get_attribute(e, :speckle_type) == OBJECTS_BUILTELEMENTS_REVIT_LEVEL
+        end
+      end
+
+      def get_mapping_info(state, selection)
+        selection = filter_out_levels(selection)
+        grouped_by_type = group_by_type(selection)
+
+        supported_entity_count = grouped_by_type.length
+
+        # Return empty method list if there is no supported entity to map.
+        return EMPTY_SELECTION if supported_entity_count == 0
+
+        # Return Direct Shape itself if multiple kinds of element are selected like Edge and Face.
+        # OR single type is equal to only direct shape supports.
+        if supported_entity_count > 1 ||
+           (supported_entity_count == 1 &&
+             MAPPER_DIRECT_SHAPE_SUPPORTED_ENTITY_TYPES.include?(grouped_by_type.keys.first))
+          return direct_shape_selection_info(selection)
+        end
+
+        # Only single type selections remained after this point.
+        return face_selection_info(state, grouped_by_type.values.first) if grouped_by_type.keys.first == Sketchup::Face
+
+        return edge_selection_info(state, grouped_by_type.values.first) if grouped_by_type.keys.first == Sketchup::Edge
+
+        EMPTY_SELECTION
+      end
+
+      MAPPER_SUPPORTED_ENTITY_TYPES = [
+        Sketchup::ComponentInstance,
+        Sketchup::Group,
+        Sketchup::Face,
+        Sketchup::Edge
+      ].freeze
+
+      MAPPER_DIRECT_SHAPE_SUPPORTED_ENTITY_TYPES = [
+        Sketchup::ComponentInstance,
+        Sketchup::Group
+      ].freeze
+
+      EMPTY_SELECTION = {
+        selection: [],
+        mappingMethods: [],
+        categories: []
+      }.freeze
+
+      def direct_shape_selection_info(selection)
+        {
+          selection: SketchupModel::Reader::MapperReader.entities_schema_details(selection),
+          mappingMethods: ['Direct Shape'],
+          categories: Mapper::Category::RevitCategory.to_a
+        }.freeze
+      end
+
+      def direct_shape_selection_info_with_default(selection, methods)
+        {
+          selection: SketchupModel::Reader::MapperReader.entities_schema_details(selection),
+          mappingMethods: ['Direct Shape'] + methods,
+          categories: Mapper::Category::RevitCategory.to_a
+        }.freeze
+      end
+
+      def direct_shape_selection_info_with_source(state, filtered_selection, methods)
+        types = state.speckle_state.speckle_mapper_state.mapper_source.types
+        levels = state.speckle_state.speckle_mapper_state.mapper_source.levels
+        instances = @selection.grep(Sketchup::ComponentInstance)
+        selected_level = instances.find do |i|
+          DICTIONARY::SpeckleEntityDictionaryHandler
+            .get_attribute(i, :speckle_type) == OBJECTS_BUILTELEMENTS_REVIT_LEVEL
+        end
+        selected_level_name = nil
+        if selected_level
+          selected_level_name = DICTIONARY::SpeckleEntityDictionaryHandler.get_attribute(selected_level, :name)
+        end
+        {
+          selection: READER::MapperReader.entities_schema_details(filtered_selection),
+          mappingMethods: ['Direct Shape'] + methods,
+          categories: Mapper::Category::RevitCategory.to_a,
+          types: types,
+          levels: levels,
+          selectedLevelName: selected_level_name
+        }.freeze
+      end
+
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      def face_selection_info(state, faces)
+        source_exist = !state.speckle_state.speckle_mapper_state.mapper_source.nil?
+        grouped_by_verticality = faces.group_by { |face| face.normal.perpendicular?(VECTOR_Z) }
+        return direct_shape_selection_info(faces) if grouped_by_verticality.length == 2
+
+        if source_exist
+          if grouped_by_verticality.keys.first
+            direct_shape_selection_info_with_source(state, faces, ['Wall'])
+          else
+            direct_shape_selection_info_with_source(state, faces, ['Floor'])
+          end
+        else
+          if grouped_by_verticality.keys.first
+            direct_shape_selection_info_with_default(faces, ['Default Wall'])
+          else
+            direct_shape_selection_info_with_default(faces, ['Default Floor'])
+          end
+        end
+      end
+
+      def edge_selection_info(state, edges)
+        source_exist = !state.speckle_state.speckle_mapper_state.mapper_source.nil?
+
+        if source_exist
+          methods = ['Column', 'Beam', 'Pipe', 'Duct']
+          direct_shape_selection_info_with_source(state, edges, methods)
+        else
+          default_methods = ['Default Column', 'Default Beam', 'Default Pipe', 'Default Duct']
+          direct_shape_selection_info_with_default(edges, default_methods)
+        end
+      end
+
+      def group_by_type_old(selection)
+        selection.group_by(&:class).filter_map do |group|
+          [group.first, group] if MAPPER_SUPPORTED_ENTITY_TYPES.include?(group.first)
+        end.to_h
+      end
+
+      def group_by_type(selection)
+        selection.select { |s| MAPPER_SUPPORTED_ENTITY_TYPES.include?(s.class) }.group_by(&:class)
+      end
+    end
+  end
+end

speckle_connector/src/actions/mapper_source_updated.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative '../mapper/mapper_source'
+require_relative '../speckle_objects/built_elements/revit/revit_element_type'
+
+module SpeckleConnector
+  module Actions
+    # Action to update mapper source.
+    class MapperSourceUpdated < Action
+      def initialize(base, stream_id, commit_id)
+        super()
+        @base = base
+        @stream_id = stream_id
+        @commit_id = commit_id
+      end
+
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def update_state(state)
+        levels = convert_levels(state, @base['@Levels'])
+        types = convert_types(@base['@Types'])
+        mapper_source = Mapper::MapperSource.new(@stream_id, @commit_id, levels, types)
+        new_speckle_state = state.speckle_state.with_mapper_source(mapper_source)
+        state = state.with_speckle_state(new_speckle_state)
+
+        state.with_add_queue('mapperSourceUpdated', @stream_id, [
+                               { is_string: false, val: levels.to_json },
+                               { is_string: false, val: types.to_json }
+                             ])
+      end
+
+      def convert_types(types)
+        types.collect do |type, type_elements|
+          next if type_elements.nil? || !type_elements.is_a?(Array) || type == '__closure'
+
+          type = type[1..-1] if type[0] == '@'
+          elements = type_elements.map do |type_element|
+            SpeckleObjects::BuiltElements::Revit::RevitElementType.to_native(type_element)
+          end
+          elements = elements.group_by { |e| e[:family] }
+          [type, elements]
+        end.compact.to_h
+      end
+
+      def convert_levels(state, levels)
+        levels.collect do |level|
+          SpeckleObjects::BuiltElements::Level.to_native(state, level, @stream_id)
+        end
+      end
+    end
+  end
+end

speckle_connector/src/actions/receive_objects.rb

@@ -3,6 +3,7 @@
 require_relative 'action'
 require_relative '../convertors/units'
 require_relative '../convertors/to_native'
+require_relative '../convertors/clean_up'
 
 module SpeckleConnector
   module Actions
@@ -26,7 +27,12 @@ module SpeckleConnector
         converter = Converters::ToNative.new(state, @stream_id, @stream_name, @branch_name, @source_app)
         # Have side effects on the sketchup model. It effects directly on the entities by adding new objects.
         start_time = Time.now.to_f
+        state.sketchup_state.sketchup_model.start_operation('Receive Speckle Objects', true)
         state = converter.receive_commit_object(@base)
+        if state.user_state.model_preferences[:merge_coplanar_faces]
+          Converters::CleanUp.merge_coplanar_faces(converter.converted_faces)
+        end
+        state.sketchup_state.sketchup_model.commit_operation
         elapsed_time = (Time.now.to_f - start_time).round(3)
         puts "==== Converting to Native executed in #{elapsed_time} sec ===="
         puts "==== Source application is #{@source_app}. ===="

speckle_connector/src/actions/select_mappings_from_table.rb

@@ -24,6 +24,9 @@ module SpeckleConnector
         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
 

speckle_connector/src/commands/apply_mappings.rb

@@ -11,9 +11,13 @@ module SpeckleConnector
         entities_to_map = data['entitiesToMap']
         method = data['method']
         category = data['category']
+        family = data['family']
+        family_type = data['familyType']
+        level = data['level']
         name = data['name']
         is_definition = data['isDefinition']
-        action = Actions::ApplyMappings.new(entities_to_map, method, category, name, is_definition)
+        action = Actions::ApplyMappings.new(entities_to_map, method, category, family,
+                                            family_type, level, name, is_definition)
         app.update_state!(action)
       end
     end

speckle_connector/src/commands/mapper_source_updated.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative 'command'
+require_relative '../actions/mapper_source_updated'
+
+module SpeckleConnector
+  module Commands
+    # Command to update mapper source.
+    class MapperSourceUpdated < Command
+      def _run(data)
+        base = data['base']
+        stream_id = data['stream_id']
+        commit_id = data['commit_id']
+        action = Actions::MapperSourceUpdated.new(base, stream_id, commit_id)
+        app.update_state!(action)
+      end
+    end
+  end
+end

speckle_connector/src/constants/geo_constants.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  VECTOR_Z = Geom::Vector3d.new(0, 0, 1)
+end

speckle_connector/src/constants/path_constants.rb

@@ -14,7 +14,7 @@ module SpeckleConnector
                            path = ENV.fetch('APPDATA')
                            Pathname.new(File.join(path, 'Speckle')).cleanpath.to_s
                          when OS_MAC
-                           File.join(Dir.home, 'Library/Application Support/Speckle')
+                           File.join(Dir.home, '.config/Speckle')
                          else
                            raise 'Speckle could not determine your Appdata path'
                          end

speckle_connector/src/constants/type_constants.rb

@@ -3,12 +3,24 @@
 module SpeckleConnector
   BASE_OBJECT = 'Base'
 
+  OBJECTS_GIS_POLYGONELEMENT = 'Objects.GIS.PolygonElement'
+
   OBJECTS_BUILTELEMENTS_VIEW3D = 'Objects.BuiltElements.View:Objects.BuiltElements.View3D'
-  OBJECTS_BUILTELEMENTS_REVIT_DIRECTSHAPE = 'Objects.BuiltElements.Revit.DirectShape'
+  OBJECTS_BUILTELEMENTS_NETWORK = 'Objects.BuiltElements.Network'
   OBJECTS_BUILTELEMENTS_REVIT_LEVEL = 'Objects.BuiltElements.Level:Objects.BuiltElements.Revit.RevitLevel'
+  OBJECTS_BUILTELEMENTS_DEFAULT_FLOOR = 'Objects.BuiltElements.Floor'
+  OBJECTS_BUILTELEMENTS_REVIT_FLOOR = 'Objects.BuiltElements.Floor:Objects.BuiltElements.Revit.RevitFloor'
+  OBJECTS_BUILTELEMENTS_DEFAULT_WALL = 'Objects.BuiltElements.Wall'
+  OBJECTS_BUILTELEMENTS_REVIT_WALL = 'Objects.BuiltElements.Wall:Objects.BuiltElements.Revit.RevitWall'
+  OBJECTS_BUILTELEMENTS_REVIT_DIRECTSHAPE = 'Objects.BuiltElements.Revit.DirectShape'
+  OBJECTS_BUILTELEMENTS_REVIT_PARAMETER = 'Objects.BuiltElements.Revit.Parameter'
+  OBJECTS_BUILTELEMENTS_REVIT_REVITELEMENTTYPE = 'Objects.BuiltElements.Revit.RevitElementType'
 
   OBJECTS_GEOMETRY_LINE = 'Objects.Geometry.Line'
   OBJECTS_GEOMETRY_POLYLINE = 'Objects.Geometry.Polyline'
+  OBJECTS_GEOMETRY_POLYCURVE = 'Objects.Geometry.Polycurve'
+  OBJECTS_GEOMETRY_ARC = 'Objects.Geometry.Arc'
+  OBJECTS_GEOMETRY_CIRCLE = 'Objects.Geometry.Circle'
   OBJECTS_GEOMETRY_MESH = 'Objects.Geometry.Mesh'
   OBJECTS_GEOMETRY_BREP = 'Objects.Geometry.Brep'
 
@@ -18,4 +30,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/clean_up.rb

@@ -11,12 +11,31 @@ module SpeckleConnector
       # @param entities [Sketchup::Entities] entities to remove edges between that make entities coplanar.
       # @note Merging coplanar faces idea originated from [CleanUp](https://github.com/thomthom/cleanup) plugin
       # which is developed by [Thomas Thomassen](https://github.com/thomthom).
-      def self.merge_coplanar_faces(entities)
+      def self.merge_coplanar_entities(entities)
         edges = []
         faces = entities.collect { |entity| entity if entity.is_a? Sketchup::Face }.compact
+        faces = merged_faces(faces)
         faces.each { |face| face.edges.each { |edge| edges << edge } }
         edges.uniq!
         edges.each { |edge| remove_edge_have_coplanar_faces(edge, faces, false) }
+        # Remove remaining orphan edges
+        edges.reject(&:deleted?).select { |edge| edge.faces.empty? }.each(&:erase!)
+        merged_faces(faces)
+      end
+
+      def self.merge_coplanar_faces(faces)
+        edges = []
+        faces = faces.reject(&:deleted?)
+
+        faces.each { |face| face.edges.each { |edge| edges << edge } }
+
+        edges.uniq!
+
+        edges.each { |edge| remove_edge_have_coplanar_faces(edge) }
+
+        # Remove remaining orphan edges
+        # edges.reject(&:deleted?).select { |edge| edge.faces.empty? }.each(&:erase!)
+
         merged_faces(faces)
       end
 
@@ -33,43 +52,29 @@ module SpeckleConnector
       #  - Whether UV texture map is aligned between faces or not.
       #  - Finally, if faces are coplanar by correcting these checks, then removes edge from Sketchup.active_model.
       # @param edge [Sketchup::Edge] edge to check.
-      # @param faces [Array<Sketchup::Face>] scoped faces to check 'edge.faces' both (first and second)
-      #  belongs to this faces or not. If any of this faces does not involve this scoped faces, then do not delete.
       # @param ignore_materials [Boolean] whether ignore materials or not.
       # Returns true if the given edge separating two coplanar faces.
       # Return false otherwise.
-      # rubocop:disable Metrics/AbcSize
-      def self.remove_edge_have_coplanar_faces(edge, faces, ignore_materials)
+      def self.remove_edge_have_coplanar_faces(edge)
         return false unless edge.valid? && edge.is_a?(Sketchup::Edge)
         return false unless edge.faces.size == 2
 
-        # Check scoped faces have this edges
-        if edge.faces.size == 2
-          is_first = faces.include?(edge.faces[0])
-          is_second = faces.include?(edge.faces[1])
-          return false unless is_first && is_second
-        end
-
         face_1, face_2 = edge.faces
 
+        return false unless face_1.normal.samedirection?(face_2.normal)
+
         return false if face_duplicate?(face_1, face_2)
         # Check for troublesome faces which might lead to missing geometry if merged.
         return false unless edge_safe_to_merge?(edge)
 
-        # Check materials match.
-        unless ignore_materials
-          return false unless (face_1.material == face_2.material) && (face_1.back_material == face_2.back_material)
+        return false unless (face_1.material == face_2.material) && (face_1.back_material == face_2.back_material)
 
-          # Verify UV mapping match.
-          return false if !face_1.material.nil? && !continuous_uv?(face_1, face_2, edge) && face_1.material.texture.nil?
-        end
         # Check faces are coplanar or not.
         return false unless faces_coplanar?(face_1, face_2)
 
         edge.erase!
         true
       end
-      # rubocop:enable Metrics/AbcSize
 
       # Determines if two faces are overlapped.
       def self.face_duplicate?(face_1, face_2, overlapping: false)

speckle_connector/src/convertors/to_native.rb

@@ -2,6 +2,8 @@
 
 require_relative 'converter'
 require_relative '../constants/type_constants'
+require_relative '../speckle_entities/speckle_entity'
+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'
@@ -10,8 +12,13 @@ require_relative '../speckle_objects/other/display_value'
 require_relative '../speckle_objects/revit/revit_instance'
 require_relative '../speckle_objects/geometry/point'
 require_relative '../speckle_objects/geometry/line'
+require_relative '../speckle_objects/geometry/polycurve'
+require_relative '../speckle_objects/geometry/arc'
+require_relative '../speckle_objects/geometry/circle'
 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
@@ -25,11 +32,14 @@ module SpeckleConnector
       # @return [String] source application of received object that will be converted to native
       attr_reader :source_app
 
+      attr_reader :converted_faces
+
       def initialize(state, stream_id, stream_name, branch_name, source_app)
         super(state, stream_id)
         @stream_name = stream_name
         @branch_name = branch_name
         @source_app = source_app.downcase
+        @converted_faces = []
       end
 
       # Module aliases
@@ -37,22 +47,32 @@ module SpeckleConnector
       OTHER = SpeckleObjects::Other
       REVIT = SpeckleObjects::Revit
       BUILTELEMENTS = SpeckleObjects::BuiltElements
+      GIS = SpeckleObjects::GIS
 
       # Class aliases
       POINT = GEOMETRY::Point
       LINE = GEOMETRY::Line
+      POLYCURVE = GEOMETRY::Polycurve
+      ARC = GEOMETRY::Arc
+      CIRCLE = GEOMETRY::Circle
       MESH = GEOMETRY::Mesh
       BLOCK_DEFINITION = OTHER::BlockDefinition
       BLOCK_INSTANCE = OTHER::BlockInstance
       REVIT_INSTANCE = REVIT::Other::RevitInstance
+      REVIT_WALL = BUILTELEMENTS::RevitWall
       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[
         Objects.Geometry.Line
         Objects.Geometry.Polyline
+        Objects.Geometry.Polycurve
+        Objects.Geometry.Arc
+        Objects.Geometry.Circle
         Objects.Geometry.Mesh
         Objects.Geometry.Brep
         Objects.Other.BlockInstance
@@ -61,27 +81,37 @@ module SpeckleConnector
         Objects.Other.RenderMaterial
         Objects.Other.Instance:Objects.Other.BlockInstance
         Objects.BuiltElements.View:Objects.BuiltElements.View3D
+        Objects.BuiltElements.Wall:Objects.BuiltElements.Revit.RevitWall
+        Objects.BuiltElements.Network
+        Objects.GIS.PolygonElement
+        Speckle.Core.Models.Collection
       ].freeze
 
       def from_revit
         @from_revit ||= source_app.include?('revit')
       end
 
+      def from_rhino
+        @from_rhino ||= source_app.include?('rhino')
+      end
+
       def from_sketchup
         @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.
       # @param obj [Object] speckle commit object.
       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.
-        layers_relation = obj['layers_relation']
-
-        # Create layers and it's folders from layers relation on the model collection.
-        SpeckleObjects::Relations::Layers.to_native(layers_relation, sketchup_model) if layers_relation && !from_revit
+        unless from_revit
+          # Create layers and it's folders from layers relation on the model collection.
+          SpeckleObjects::Relations::Layers.to_native(obj, source_app, sketchup_model)
+        end
 
         # By default entities to fill is sketchup model's entities.
         @entities_to_fill = sketchup_model.entities
@@ -92,16 +122,28 @@ module SpeckleConnector
           @entities_to_fill = @branch_definition.entities
         end
 
-        traverse_commit_object(obj, @entities_to_fill)
+        default_commit_layer = sketchup_model.layers.layers.find { |layer| layer.display_name == '@Untagged' }
+
+        traverse_commit_object(obj, default_commit_layer, @entities_to_fill)
         create_levels_from_section_planes
         check_hiding_layers_needed
-
-        if !from_sketchup && !@is_update_commit
-          sketchup_model.entities.add_instance(@branch_definition, Geom::Transformation.new)
-        end
+        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
@@ -212,9 +254,9 @@ module SpeckleConnector
       #   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, entities)
+      def traverse_commit_object(obj, layer, entities)
         if convertible_to_native?(obj)
-          @state = convert_to_native(@state, obj, entities)
+          @state, _converted_entities = convert_to_native(@state, obj, layer, entities)
         elsif obj.is_a?(Hash) && obj.key?('speckle_type')
           return if ignored_speckle_type?(obj)
 
@@ -222,23 +264,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|
-              traverse_commit_object(obj[prop], 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, entities)
+            @state, _converted_entities = convert_to_native(@state, obj, layer, entities)
           end
         elsif obj.is_a?(Hash)
-          obj.each_value { |value| traverse_commit_object(value, entities) }
+          obj.each_value { |value| traverse_commit_object(value, layer, entities) }
         elsif obj.is_a?(Array)
-          obj.each { |value| traverse_commit_object(value, entities) }
+          obj.each { |value| traverse_commit_object(value, layer, entities) }
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
 
       def speckle_object_to_native(obj)
-        return DISPLAY_VALUE.method(:to_native) unless obj['displayValue'].nil?
+        return DISPLAY_VALUE.method(:to_native) unless obj['displayValue'].nil? && obj['@displayValue'].nil?
 
         SPECKLE_OBJECT_TO_NATIVE[obj['speckle_type']]
       end
@@ -246,6 +288,9 @@ module SpeckleConnector
       SPECKLE_OBJECT_TO_NATIVE = {
         OBJECTS_GEOMETRY_LINE => LINE.method(:to_native),
         OBJECTS_GEOMETRY_POLYLINE => LINE.method(:to_native),
+        OBJECTS_GEOMETRY_POLYCURVE => POLYCURVE.method(:to_native),
+        OBJECTS_GEOMETRY_ARC => ARC.method(:to_native),
+        OBJECTS_GEOMETRY_CIRCLE => CIRCLE.method(:to_native),
         OBJECTS_GEOMETRY_MESH => MESH.method(:to_native),
         OBJECTS_GEOMETRY_BREP => MESH.method(:to_native),
         OBJECTS_OTHER_BLOCKDEFINITION => BLOCK_DEFINITION.method(:to_native),
@@ -253,18 +298,25 @@ module SpeckleConnector
         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_BUILTELEMENTS_VIEW3D => VIEW3D.method(:to_native)
+        OBJECTS_BUILTELEMENTS_VIEW3D => VIEW3D.method(:to_native),
+        OBJECTS_BUILTELEMENTS_REVIT_WALL => REVIT_WALL.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
-      def convert_to_native(state, obj, entities = sketchup_model.entities)
+      def convert_to_native(state, obj, layer, entities = sketchup_model.entities)
         # store this method as parameter to re-call it inner callstack
         convert_to_native = method(:convert_to_native)
         # Get 'to_native' method to convert upcoming speckle object to native sketchup entity
         to_native_method = speckle_object_to_native(obj)
         # Call 'to_native' method by passing this method itself to handle nested 'to_native' conversions.
         # It returns updated state and converted entities.
-        state, converted_entities = to_native_method.call(state, obj, entities, &convert_to_native)
+        state, converted_entities = to_native_method.call(state, obj, layer, entities, &convert_to_native)
+        faces = converted_entities.select { |e| e.is_a?(Sketchup::Face) }
+        @converted_faces += faces if faces.any?
         if from_revit
           # Create levels as section planes if they exists
           create_levels(state, obj)
@@ -272,11 +324,11 @@ module SpeckleConnector
           create_layers_from_categories(state, obj, converted_entities)
         end
         # Create speckle entities from sketchup entities to achieve continuous traversal.
-        convert_to_speckle_entities(state, obj, converted_entities)
+        SpeckleEntities::SpeckleEntity.from_speckle_object(state, obj, converted_entities, stream_id)
       rescue StandardError => e
         puts("Failed to convert #{obj['speckle_type']} (id: #{obj['id']})")
         puts(e)
-        return state
+        return state, []
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
@@ -321,30 +373,9 @@ module SpeckleConnector
       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) || 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]
-
-          ent = SpeckleEntities::SpeckleEntity.new(entity, speckle_id, application_id, speckle_type, children,
-                                                   [stream_id])
-          ent.write_initial_base_data
-          speckle_state = speckle_state.with_speckle_entity(ent)
-        end
-        state.with_speckle_state(speckle_state)
+      def convert_to_speckle_entities(state, speckle_objects_with_entities)
+        return state if speckle_objects_with_entities.empty?
       end
-      # rubocop:enable Metrics/PerceivedComplexity
-      # rubocop:enable Metrics/CyclomaticComplexity
     end
     # rubocop:enable Metrics/ClassLength
   end

speckle_connector/src/convertors/to_speckle.rb

@@ -15,6 +15,7 @@ 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/reader/mapper_reader'
 require_relative '../sketchup_model/query/entity'
 
 module SpeckleConnector
@@ -33,8 +34,6 @@ module SpeckleConnector
         new_speckle_state, model_collection = MODEL_COLLECTION.from_sketchup_model(sketchup_model, speckle_state,
                                                                                    @units, preferences, &convert)
 
-        # send only layers that have any object
-        model_collection[:layers_relation] = SpeckleObjects::Relations::Layers.from_model(sketchup_model)
         return new_speckle_state, model_collection
       end
 
@@ -65,7 +64,7 @@ module SpeckleConnector
       def convert(entity, preferences, speckle_state, parent = :base)
         convert = method(:convert)
 
-        unless SketchupModel::Reader::SpeckleEntitiesReader.mapped_with_schema?(entity)
+        unless SketchupModel::Reader::MapperReader.mapped_with_schema?(entity)
           return from_native_to_speckle(entity, preferences, speckle_state, parent, &convert)
         end
 
@@ -74,7 +73,7 @@ module SpeckleConnector
 
       def from_mapped_to_speckle(entity, path, preferences)
         direct_shape = SpeckleObjects::BuiltElements::Revit::DirectShape
-                       .from_entity(entity, path, @units, preferences)
+                       .from_entity(speckle_state, entity, path, @units, preferences)
         return [direct_shape, [entity]]
       end
 
@@ -86,7 +85,7 @@ module SpeckleConnector
         end
 
         if entity.is_a?(Sketchup::Face)
-          mesh = SpeckleObjects::Geometry::Mesh.from_face(face: entity, units: @units,
+          mesh = SpeckleObjects::Geometry::Mesh.from_face(speckle_state: speckle_state, face: entity, units: @units,
                                                           model_preferences: preferences[:model])
           return speckle_state, [mesh, [entity]]
         end

speckle_connector/src/log/log.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  # Helper module for logging.
+  module Log
+    def self.write_to_file(text, file_name = 'log', path = "#{ENV['HOME']}/Desktop")
+      file_path = path + "/#{file_name}.json"
+      File.delete(file_path) if File.exist?(file_path)
+      File.write(file_path, text)
+    end
+  end
+end

speckle_connector/src/mapper/category/revit_category.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SpeckleConnector
-  module Mapping
+  module Mapper
     module Category
       # Revit categories.
       class RevitCategory < Hash

speckle_connector/src/mapper/mapper.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative '../speckle_objects/built_elements/revit/revit_floor'
+require_relative '../speckle_objects/built_elements/revit/revit_wall'
+require_relative '../speckle_objects/built_elements/default_floor'
+require_relative '../speckle_objects/built_elements/default_wall'
+require_relative '../sketchup_model/query/entity'
+require_relative '../sketchup_model/reader/mapper_reader'
+require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  # Mapper is a tool to convert SketchUp entities to other applications' native objects.
+  module Mapper
+    # Collects mapped entities on selection as flat list.
+    def self.mapped_entities_on_selection(sketchup_model)
+      flat_selection_with_path = SketchupModel::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 = SketchupModel::Reader::MapperReader.mapped_with_schema?(entity)
+        if entity.respond_to?(:definition)
+          is_definition_mapped = SketchupModel::Reader::MapperReader.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.to_speckle(speckle_state, entity, units, global_transformation: nil)
+      speckle_schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.speckle_schema_to_speckle(entity)
+      return speckle_schema if speckle_schema.nil?
+
+      if speckle_schema['method'] == 'Default Floor'
+        return SpeckleObjects::BuiltElements::DefaultFloor
+               .to_speckle_schema(entity, units, global_transformation: global_transformation)
+      end
+
+      if speckle_schema['method'] == 'Floor'
+        return SpeckleObjects::BuiltElements::RevitFloor
+               .to_speckle_schema(speckle_state, entity, units, global_transformation: global_transformation)
+      end
+
+      if speckle_schema['method'] == 'Default Wall'
+        return SpeckleObjects::BuiltElements::DefaultWall
+               .to_speckle_schema(entity, units, global_transformation: global_transformation)
+      end
+
+      if speckle_schema['method'] == 'Wall'
+        return SpeckleObjects::BuiltElements::RevitWall
+               .to_speckle_schema(speckle_state, entity, units, global_transformation: global_transformation)
+      end
+
+      return speckle_schema
+    end
+  end
+end

speckle_connector/src/mapper/mapper_source.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative '../immutable/immutable'
+require_relative '../speckle_objects/built_elements/level'
+require_relative '../speckle_objects/built_elements/revit/revit_element_type'
+
+module SpeckleConnector
+  # Mapper is a tool to convert SketchUp entities to other applications' native objects.
+  module Mapper
+    # Mapper source object that collects information about stream id and commit id to identify source in the branch,
+    # also contains levels and family types to be able to map objects with them.
+    class MapperSource
+      # @return [String] stream id of the mapper source.
+      attr_reader :stream_id
+
+      # @return [String] commit id of the mapper source.
+      attr_reader :commit_id
+
+      # @return [Array<SpeckleObjects::BuiltElements::Level>] levels in the source branch.
+      attr_reader :levels
+
+      # @return [ImmutableHash{String=>Array<SpeckleObjects::BuiltElements::Revit::RevitElementType>}] revit element
+      #  types.
+      attr_reader :types
+
+      def initialize(stream_id, commit_id, levels, types)
+        @stream_id = stream_id
+        @commit_id = commit_id
+        @levels = levels
+        @types = types
+      end
+    end
+  end
+end

speckle_connector/src/preferences/preferences.rb

@@ -12,9 +12,9 @@ module SpeckleConnector
     include Immutable::ImmutableUtils
     DICT_HANDLER = SketchupModel::Dictionary::SpeckleModelDictionaryHandler
     # rubocop:disable Layout/LineLength
-    DEFAULT_CONFIG = "('configSketchup', '{\"dark_theme\":false, \"diffing\":false, \"register_speckle_entity\":false}');"
+    DEFAULT_CONFIG = "('configSketchup', '{\"dark_theme\":false, \"diffing\":false, \"register_speckle_entity\":false, \"fe2\":false}');"
     # rubocop:enable Layout/LineLength
-    DEFAULT_PREFERENCES = '{"dark_theme":false, "diffing":false, "register_speckle_entity": false}'
+    DEFAULT_PREFERENCES = '{"dark_theme":false, "diffing":false, "register_speckle_entity": false, "fe2": false}'
 
     # @param sketchup_model [Sketchup::Model] active model.
     def self.read_preferences(sketchup_model)
@@ -34,10 +34,16 @@ module SpeckleConnector
     def self.data_complete?(row_data)
       return false if row_data.empty?
 
-      data = JSON.parse(row_data.first.first)
-      return false if data['dark_theme'].nil? || data['diffing'].nil? || data['register_speckle_entity'].nil?
+      begin
+        data = JSON.parse(row_data.first.first)
+        if data['dark_theme'].nil? || data['fe2'].nil? || data['diffing'].nil? || data['register_speckle_entity'].nil?
+          return false
+        end
 
-      true
+        true
+      rescue StandardError
+        false
+      end
     end
 
     # Validates current preferences. If there are incomplete data then this method resets it with default preferences.
@@ -65,11 +71,13 @@ module SpeckleConnector
       data_hash = JSON.parse(row_data).to_h
       # Get current theme value
       dark_theme = data_hash['dark_theme']
+      fe2 = data_hash['fe2']
       diffing = data_hash['diffing']
       register_speckle_entity = data_hash['register_speckle_entity']
 
       {
         dark_theme: dark_theme,
+        fe2: fe2,
         diffing: diffing,
         register_speckle_entity: register_speckle_entity
       }.freeze

speckle_connector/src/sketchup_model/query/layer.rb

@@ -18,6 +18,25 @@ module SpeckleConnector
             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

speckle_connector/src/sketchup_model/reader/mapper_reader.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require_relative '../dictionary/speckle_schema_dictionary_handler'
+require_relative '../../speckle_entities/speckle_entity'
+require_relative '../../mapper/category/revit_category'
+require_relative '../../constants/dict_constants'
+
+module SpeckleConnector
+  # Operations related to {SketchupModel}.
+  module SketchupModel
+    # Reader model for sketchup model.
+    module Reader
+      # Reader module for mapper.
+      module MapperReader
+        # @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 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
+
+        def self.mapped_entity_details(entities)
+          reverse_category_dictionary = Mapper::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
+            category = get_map_attribute(speckle_schema, speckle_schema_definition, 'category')
+            {
+              name: get_map_attribute(speckle_schema, speckle_schema_definition, 'name'),
+              category: category,
+              categoryName: category.nil? ? '' : reverse_category_dictionary[category],
+              method: get_map_attribute(speckle_schema, 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
+
+        def self.get_map_attribute(schema, definition_schema, attribute)
+          return schema[attribute] if schema[attribute]
+          return definition_schema[attribute] if !definition_schema.nil? && definition_schema[attribute]
+
+          nil
+        end
+      end
+    end
+  end
+end

speckle_connector/src/sketchup_model/reader/speckle_entities_reader.rb

@@ -2,7 +2,7 @@
 
 require_relative '../dictionary/speckle_schema_dictionary_handler'
 require_relative '../../speckle_entities/speckle_entity'
-require_relative '../../mapping/category/revit_category'
+require_relative '../../mapper/category/revit_category'
 require_relative '../../constants/dict_constants'
 
 module SpeckleConnector
@@ -29,16 +29,6 @@ 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 }
@@ -60,63 +50,7 @@ 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
-
-        def self.mapped_entity_details(entities)
-          reverse_category_dictionary = Mapping::Category::RevitCategory.reverse_dictionary
-          entities.collect do |entity|
-            speckle_schema = get_schema(entity)
-            {
-              name: speckle_schema['name'],
-              category: speckle_schema['category'],
-              categoryName: reverse_category_dictionary[speckle_schema['category']],
-              method: speckle_schema['method'],
-              entityName: entity.respond_to?(:name) ? entity.name : '',
-              entityId: entity.persistent_id,
-              entityType: entity.class.name.split('::').last.gsub(/(?<=[a-z])(?=[A-Z])/, ' ').split.first,
-              schema: speckle_schema,
-              definitionSchema: entity.respond_to?(:definition) ? get_schema(entity.definition) : nil
-            }
-          end
-        end
       end
     end
   end

speckle_connector/src/sketchup_model/utils/face_utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../constants/geo_constants'
+
 module SpeckleConnector
   # Operations related to {SketchupModel}.
   module SketchupModel
@@ -24,6 +26,13 @@ module SpeckleConnector
           end
           adj_faces.uniq
         end
+
+        # @param face [Sketchup::Face] face to get max z distance for all vertices.
+        def self.max_z(face)
+          points = face.vertices.collect(&:position)
+          points_z_values = points.collect(&:z)
+          points_z_values.max - points_z_values.min
+        end
       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

@@ -119,6 +119,32 @@ module SpeckleConnector
       def valid?
         sketchup_entity.valid?
       end
+
+      # @param state [States::State] state of the application
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def self.from_speckle_object(state, speckle_object, entities, stream_id)
+        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) || 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]
+
+          ent = SpeckleEntity.new(entity, speckle_id, application_id, speckle_type, children, [stream_id])
+          ent.write_initial_base_data
+          speckle_state = speckle_state.with_speckle_entity(ent)
+        end
+        new_state = state.with_speckle_state(speckle_state)
+        return new_state, entities
+      end
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

speckle_connector/src/speckle_objects/built_elements/default_floor.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../built_elements/revit/parameter'
+require_relative '../other/render_material'
+require_relative '../geometry/line'
+require_relative '../geometry/polyline'
+require_relative '../../constants/type_constants'
+require_relative '../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      # Default Floor object.
+      class DefaultFloor < Base
+        SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_DEFAULT_FLOOR
+
+        def initialize(outline:, voids:, units:, material:, application_id: nil)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: application_id,
+            id: nil
+          )
+          self[:outline] = outline
+          self[:voids] = voids
+          self[:units] = units
+          self[:renderMaterial] = material
+        end
+
+        # @param face [Sketchup::Face] face to get speckle schema for floor.
+        def self.to_speckle_schema(face, units, global_transformation: nil)
+          outline = Geometry::Polyline.from_loop(face.loops.first, units, global_transformation: global_transformation)
+          voids = []
+          if face.loops.length > 1
+            voids = face.loops[1..face.loops.length - 1].collect do |loop|
+              Geometry::Polyline.from_loop(loop, units, global_transformation: global_transformation)
+            end
+          end
+          material = face.material || face.back_material
+
+          DefaultFloor.new(
+            outline: outline,
+            voids: voids,
+            units: units,
+            material: material.nil? ? nil : Other::RenderMaterial.from_material(face.material || face.back_material),
+            application_id: face.persistent_id
+          )
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/built_elements/default_wall.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../built_elements/revit/parameter'
+require_relative '../other/render_material'
+require_relative '../geometry/length'
+require_relative '../geometry/line'
+require_relative '../geometry/polyline'
+require_relative '../../constants/type_constants'
+require_relative '../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+require_relative '../../sketchup_model/utils/face_utils'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      # Default Wall object.
+      class DefaultWall < Base
+        SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_DEFAULT_WALL
+
+        def initialize(base_line:, height:, flipped:, units:, material:, application_id: nil)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: application_id,
+            id: nil
+          )
+          self[:baseLine] = base_line
+          self[:height] = height
+          self[:flipped] = flipped
+          self[:units] = units
+          self[:renderMaterial] = material
+        end
+
+        # @param face [Sketchup::Face] face to get speckle schema for floor.
+        def self.to_speckle_schema(face, units, global_transformation: nil)
+          base_line = Geometry::Line.base_line_from_face(face, units, global_transformation: global_transformation)
+
+          material = face.material || face.back_material
+
+          DefaultWall.new(
+            base_line: base_line,
+            height: Geometry.length_to_speckle(SketchupModel::Utils::FaceUtils.max_z(face), units),
+            flipped: false,
+            units: units,
+            material: material.nil? ? nil : Other::RenderMaterial.from_material(face.material || face.back_material),
+            application_id: face.persistent_id
+          )
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/built_elements/level.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../other/render_material'
+require_relative '../geometry/line'
+require_relative '../geometry/length'
+require_relative '../geometry/polyline'
+require_relative '../../constants/type_constants'
+require_relative '../../sketchup_model/dictionary/speckle_entity_dictionary_handler'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      # Level object.
+      class Level < Base
+        SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_REVIT_LEVEL
+
+        def initialize(name:, elevation:, units:, element_id:, application_id: nil, id: nil)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: application_id,
+            id: id
+          )
+          self[:name] = name
+          self[:elevation] = elevation
+          self[:units] = units
+          self[:elementId] = element_id
+          self[:referenceOnly] = true
+          self[:createView] = false
+        end
+
+        # @param state [States::State] state of the application.
+        def self.to_native(state, speckle_level, stream_id)
+          sketchup_model = state.sketchup_state.sketchup_model
+          levels_layer = sketchup_model.layers.layers.find { |layer| layer.display_name == 'Levels' }
+          levels_layer = sketchup_model.layers.add('Levels') if levels_layer.nil?
+
+          name = speckle_level['name']
+          elevation = speckle_level['elevation']
+          units = speckle_level['units']
+          element_id = speckle_level['elementId']
+          application_id = speckle_level['applicationId']
+          id = speckle_level['id']
+
+          skp_elevation = Geometry.length_to_native(elevation, units)
+
+          definition_name = "#{name}-#{application_id}"
+          definition = sketchup_model.definitions.find { |definition| definition.name == definition_name }
+          definition.entities.clear! unless definition.nil?
+          definition = sketchup_model.definitions.add(definition_name) if definition.nil?
+          instance = sketchup_model.entities.add_instance(definition, Geom::Transformation.new)
+          instance.locked = true
+          SketchupModel::Dictionary::SpeckleEntityDictionaryHandler.write_initial_base_data(
+            instance, application_id, id, SPECKLE_TYPE, [], stream_id
+          )
+          SketchupModel::Dictionary::SpeckleEntityDictionaryHandler.set_attribute(instance, :name, name)
+
+          SketchupModel::Dictionary::SpeckleEntityDictionaryHandler.write_initial_base_data(
+            definition, application_id, id, SPECKLE_TYPE, [], stream_id
+          )
+          SketchupModel::Dictionary::SpeckleEntityDictionaryHandler.set_attribute(definition, :name, name)
+
+          c1_e = Geom::Point3d.new(0, 10.m, skp_elevation)
+          c2_e = Geom::Point3d.new(0, 0, skp_elevation)
+          c3_e = Geom::Point3d.new(10.m, 0, skp_elevation)
+          cline_1 = definition.entities.add_cline(c1_e, c2_e)
+          cline_2 = definition.entities.add_cline(c2_e, c3_e)
+          text = definition.entities.add_text(" #{name}", c1_e)
+          [cline_1, cline_2, text, definition, instance].each { |o| o.layer = levels_layer }
+
+          Level.new(
+            name: name,
+            elevation: elevation,
+            units: units,
+            element_id: element_id,
+            application_id: application_id,
+            id: speckle_level['id']
+          )
+        end
+      end
+    end
+  end
+end

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, _converted_entities = 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

@@ -2,9 +2,13 @@
 
 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/reader/mapper_reader'
+require_relative '../../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -30,6 +34,41 @@ module SpeckleConnector
             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(
@@ -39,9 +78,9 @@ module SpeckleConnector
             mapped_selection = []
             flat_selection_with_path.each do |entities|
               entity = entities[0]
-              is_entity_mapped = READER::SpeckleEntitiesReader.mapped_with_schema?(entity)
+              is_entity_mapped = READER::MapperReader.mapped_with_schema?(entity)
               if entity.respond_to?(:definition)
-                is_definition_mapped = READER::SpeckleEntitiesReader.mapped_with_schema?(entity.definition)
+                is_definition_mapped = READER::MapperReader.mapped_with_schema?(entity.definition)
                 mapped_selection.append(entities) if is_entity_mapped || is_definition_mapped
                 next
               end
@@ -50,7 +89,7 @@ module SpeckleConnector
             mapped_selection
           end
 
-          def self.from_entity(entity, path, units, preferences)
+          def self.from_entity(speckle_state, entity, path, units, preferences)
             schema = DICTIONARY::SpeckleSchemaDictionaryHandler.attribute_dictionary(entity)
             if schema.nil? && entity.respond_to?(:definition)
               schema = DICTIONARY::SpeckleSchemaDictionaryHandler.attribute_dictionary(entity.definition)
@@ -64,7 +103,7 @@ module SpeckleConnector
                                       entity.definition.entities, [Sketchup::Face], path.append(entity)
                                     )
             end
-            base_geometries = group_faces_under_mesh_by_material(entities_with_path, units, preferences)
+            base_geometries = group_faces_under_mesh_by_material(speckle_state, entities_with_path, units, preferences)
             DirectShape.new(
               name: schema[:name], category: schema[:category], units: units,
               base_geometries: base_geometries, application_id: entity.persistent_id
@@ -72,7 +111,7 @@ module SpeckleConnector
           end
 
           # rubocop:disable Metrics/MethodLength
-          def self.group_faces_under_mesh_by_material(faces_with_path, units, preferences)
+          def self.group_faces_under_mesh_by_material(speckle_state, faces_with_path, units, preferences)
             mesh_groups = {}
             faces_with_path.each do |face_with_path|
               face = face_with_path[0]
@@ -86,6 +125,7 @@ module SpeckleConnector
                 mesh_group[1].append(face)
               else
                 mesh = Geometry::Mesh.from_face(
+                  speckle_state: speckle_state,
                   face: face, units: units, model_preferences: preferences[:model],
                   global_transform: QUERY::Entity.global_transformation(face, entity_path),
                   parent_material: parent_material

speckle_connector/src/speckle_objects/built_elements/revit/parameter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative '../../base'
+require_relative '../../../constants/type_constants'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      module Revit
+        # Revit parameter.
+        class Parameter < Base
+          SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_REVIT_PARAMETER
+          def initialize(name:, application_id: nil)
+            super(
+              speckle_type: SPECKLE_TYPE,
+              total_children_count: 0,
+              application_id: application_id,
+              id: id
+            )
+            self[:name] = name
+          end
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/built_elements/revit/revit_element_type.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative '../../base'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      module Revit
+        # Revit element type.
+        class RevitElementType < Base
+          SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_REVIT_REVITELEMENTTYPE
+
+          # rubocop:disable Metrics/ParameterLists
+          def initialize(category:, family:, type:, element_id:, application_id: nil, id: nil)
+            super(
+              speckle_type: SPECKLE_TYPE,
+              total_children_count: 0,
+              application_id: application_id,
+              id: id
+            )
+            self[:category] = category
+            self[:family] = family
+            self[:type] = type
+            self[:elementId] = element_id
+          end
+          # rubocop:enable Metrics/ParameterLists
+
+          def self.to_native(revit_element_type)
+            RevitElementType.new(
+              category: revit_element_type['category'],
+              family: revit_element_type['family'],
+              type: revit_element_type['type'],
+              element_id: revit_element_type['elementId'],
+              application_id: revit_element_type['applicationId'],
+              id: revit_element_type['id']
+            )
+          end
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/built_elements/revit/revit_floor.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require_relative '../../base'
+require_relative '../../built_elements/revit/parameter'
+require_relative '../../other/render_material'
+require_relative '../../geometry/line'
+require_relative '../../geometry/polyline'
+require_relative '../../../constants/type_constants'
+require_relative '../../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      # Revit floor object.
+      class RevitFloor < Base
+        SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_REVIT_FLOOR
+
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(family:, type:, outline:, voids:, level:, units:, material:, parameters:nil, application_id: nil)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: application_id,
+            id: nil
+          )
+          self[:family] = family
+          self[:type] = type
+          self[:level] = level
+          self[:outline] = outline
+          self[:voids] = voids
+          self[:units] = units
+          self[:parameters] = parameters
+          self[:renderMaterial] = material
+        end
+        # rubocop:enable Metrics/ParameterLists
+
+        # @param face [Sketchup::Face] face to get speckle schema for floor.
+        def self.to_speckle_schema(speckle_state, face, units, global_transformation: nil)
+          outline = Geometry::Polyline.from_loop(face.loops.first, units, global_transformation: global_transformation)
+          voids = []
+          if face.loops.length > 1
+            voids = face.loops[1..face.loops.length - 1].collect do |loop|
+              Geometry::Polyline.from_loop(loop, units, global_transformation: global_transformation)
+            end
+          end
+          material = face.material || face.back_material
+          schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.speckle_schema_to_speckle(face).to_h
+          source_exist = !speckle_state.speckle_mapper_state.mapper_source.nil?
+          level = nil
+          parameters = nil
+          if source_exist
+            level = speckle_state.speckle_mapper_state.mapper_source.levels.find { |l| l[:name] == schema['level'] }
+            parameters = Base.new
+            offset_parameter = BuiltElements::Revit::Parameter.new(name: 'Height Offset From Level')
+            level_z = Geometry.length_to_native(level[:elevation], level[:units])
+            min_z = face.vertices.collect(&:position).map(&:z).min
+            offset_parameter['value'] = Geometry.length_to_speckle(min_z - level_z, units)
+            offset_parameter['units'] = units
+            parameters['Height Offset From Level'] = offset_parameter
+          end
+
+          RevitFloor.new(
+            family: schema['family'],
+            type: schema['family_type'],
+            outline: outline,
+            voids: voids,
+            level: level,
+            units: units,
+            parameters: parameters,
+            material: material.nil? ? nil : Other::RenderMaterial.from_material(face.material || face.back_material),
+            application_id: face.persistent_id
+          )
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/built_elements/revit/revit_wall.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require_relative '../../base'
+require_relative '../../built_elements/revit/parameter'
+require_relative '../../other/render_material'
+require_relative '../../geometry/line'
+require_relative '../../geometry/length'
+require_relative '../../../constants/type_constants'
+require_relative '../../../sketchup_model/dictionary/speckle_schema_dictionary_handler'
+require_relative '../../../sketchup_model/utils/face_utils'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module BuiltElements
+      # Revit wall object.
+      class RevitWall < Base
+        SPECKLE_TYPE = OBJECTS_BUILTELEMENTS_REVIT_WALL
+
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(family:, type:, base_line:, height:, flipped:, level:, units:, material:, parameters: nil, application_id: nil)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: application_id,
+            id: nil
+          )
+          self[:family] = family
+          self[:type] = type
+          self[:height] = height
+          self[:flipped] = flipped
+          self[:level] = level
+          self[:baseLine] = base_line
+          self[:units] = units
+          self[:parameters] = parameters
+          self[:renderMaterial] = material
+        end
+        # rubocop:enable Metrics/ParameterLists
+
+        def self.to_native(state, wall, layer, entities, &convert_to_native)
+          obj = Other::DisplayValue.collect_definition_geometries(wall)
+          obj['name'] = Other::DisplayValue.get_definition_name(obj)
+
+          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 = Other::DisplayValue.get_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
+
+        # @param face [Sketchup::Face] face to get speckle schema for wall.
+        def self.to_speckle_schema(speckle_state, face, units, global_transformation: nil)
+          base_line = Geometry::Line.base_line_from_face(face, units, global_transformation: global_transformation)
+
+          material = face.material || face.back_material
+          schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.speckle_schema_to_speckle(face).to_h
+          source_exist = !speckle_state.speckle_mapper_state.mapper_source.nil?
+          level = nil
+          parameters = nil
+          if source_exist
+            level = speckle_state.speckle_mapper_state.mapper_source.levels.find { |l| l[:name] == schema['level'] }
+            parameters = Base.new
+            offset_parameter = BuiltElements::Revit::Parameter.new(name: 'Height Offset From Level')
+            level_z = Geometry.length_to_native(level[:elevation], level[:units])
+            min_z = face.vertices.collect(&:position).map(&:z).min
+            offset_parameter['value'] = Geometry.length_to_speckle(min_z - level_z, units)
+            offset_parameter['units'] = units
+            parameters['Height Offset From Level'] = offset_parameter
+          end
+
+          RevitWall.new(
+            family: schema['family'],
+            type: schema['family_type'],
+            base_line: base_line,
+            height: Geometry.length_to_speckle(SketchupModel::Utils::FaceUtils.max_z(face), units),
+            flipped: false,
+            level: level,
+            units: units,
+            parameters: parameters,
+            material: material.nil? ? nil : Other::RenderMaterial.from_material(face.material || face.back_material),
+            application_id: face.persistent_id
+          )
+        end
+
+        def self.get_wall_height(face, units)
+          points = face.vertices.collect(&:position)
+          points_z_values = points.collect(&:z)
+          Geometry.length_to_speckle(points_z_values.max - points_z_values.min, units)
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/built_elements/view3d.rb

@@ -19,7 +19,7 @@ module SpeckleConnector
         # @param direction [SpeckleObjects::Geometry::Vector] direction of the view from eye to target.
         # @param up_direction [SpeckleObjects::Geometry::Vector] up direction of the view.
         # @param is_perspective [Boolean] whether view is perspective or not.
-        # @param lens [Boolean] fov value of the view camera.
+        # @param lens [Numeric] focal length value of the view camera.
         # @param units [String] units of the camera.
         # @param application_id [String] application_id of the view.
         # @param update_properties [Hash{Symbol=>boolean}] properties of the view.
@@ -60,41 +60,47 @@ module SpeckleConnector
           target = get_camera_target(cam, units)
           direction = get_camera_direction(cam, units)
           update_properties = get_scene_update_properties(page)
-          rendering_options = SpeckleObjects::Others::RenderingOptions.to_speckle(page.rendering_options)
+          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
+            cam.perspective?, cam.perspective? ? cam.focal_length : 35, units, page.name,
+            update_properties, rendering_options
           )
         end
 
         # @param state [States::State] state of the speckle app.
         # @param obj [Hash] commit object.
-        # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/CyclomaticComplexity
-        def self.to_native(state, view, _entities, &_convert_to_native)
+        def self.to_native(state, view, _layer, _entities, &_convert_to_native)
           sketchup_model = state.sketchup_state.sketchup_model
-
           return state, [] unless view['speckle_type'] == 'Objects.BuiltElements.View:Objects.BuiltElements.View3D'
 
           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
+          camera = create_camera(view)
+          sketchup_model.active_view.camera = 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/CyclomaticComplexity
+
+        def self.create_camera(view)
+          origin = view['origin']
+          target = view['target']
+          focal_length = view['lens'] || 35
+          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.
+          is_perspective = !view['isOrthogonal']
+          camera = Sketchup::Camera.new(origin, target, up, is_perspective)
+          camera.focal_length = focal_length if is_perspective
+          camera.height = (origin - target).length * 2 unless is_perspective
+          camera
+        end
 
         # @param page [Sketchup::Page] scene to update -update properties-
         def self.set_page_update_properties(page, update_properties)
@@ -109,7 +115,7 @@ module SpeckleConnector
             next if rendering_options[prop].nil?
 
             rendering_options[prop] = if value.is_a?(Hash)
-                                        SpeckleObjects::Others::Color.to_native(value)
+                                        SpeckleObjects::Other::Color.to_native(value)
                                       else
                                         value
                                       end

speckle_connector/src/speckle_objects/geometry/arc.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../../constants/type_constants'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Geometry
+      # Arc object definition for Speckle.
+      class Arc < Base
+        SPECKLE_TYPE = OBJECTS_GEOMETRY_ARC
+
+        # @param [States::State] state of the current application.
+        # @param arc [Object] object represents Speckle Arc.
+        # @param layer [Sketchup::Layer] layer to add {Sketchup::Edge} into it.
+        # @param entities [Sketchup::Entities] entities collection to add {Sketchup::Edge} into it.
+        def self.to_native(state, arc, layer, entities, &_convert_to_native)
+          plane = arc['plane']
+          units = arc['units']
+          origin = Point.to_native(plane['origin']['x'], plane['origin']['y'], plane['origin']['z'], units)
+          normal = Vector.to_native(plane['normal']['x'], plane['normal']['y'], plane['normal']['z'], units)
+          x_axis = Vector.to_native(plane['xdir']['x'], plane['xdir']['y'], plane['xdir']['z'], units)
+          radius = Geometry.length_to_native(arc['radius'], units)
+          edges = entities.add_arc(origin, x_axis, normal, radius, arc['startAngle'], arc['endAngle'])
+          edges.each { |edge| edge.layer = layer }
+          return state, edges
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/geometry/circle.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'point'
+require_relative 'vector'
+require_relative 'length'
+require_relative '../base'
+require_relative '../../constants/type_constants'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Geometry
+      # Circle object definition for Speckle.
+      class Circle < Base
+        SPECKLE_TYPE = OBJECTS_GEOMETRY_CIRCLE
+
+        # @param [States::State] state of the current application.
+        # @param circle [Object] object represents Speckle Circle.
+        # @param layer [Sketchup::Layer] layer to add {Sketchup::Edge} into it.
+        # @param entities [Sketchup::Entities] entities collection to add {Sketchup::Edge} into it.
+        def self.to_native(state, circle, layer, entities, &_convert_to_native)
+          plane = circle['plane']
+          units = circle['units']
+          origin = Point.to_native(plane['origin']['x'], plane['origin']['y'], plane['origin']['z'], units)
+          normal = Vector.to_native(plane['normal']['x'], plane['normal']['y'], plane['normal']['z'], units)
+          radius = Geometry.length_to_native(circle['radius'], units)
+          edges = entities.add_circle(origin, normal, radius)
+          edges.each { |edge| edge.layer = layer }
+          return state, edges
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/geometry/line.rb

@@ -40,7 +40,7 @@ module SpeckleConnector
         # rubocop:enable Metrics/ParameterLists
 
         # @param edge [Sketchup::Edge] edge to convert line.
-        def self.from_edge(edge, units, model_preferences)
+        def self.from_edge(edge, units, model_preferences, global_transformation: nil)
           dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
                          .attribute_dictionaries_to_speckle(edge, model_preferences)
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
@@ -53,19 +53,56 @@ module SpeckleConnector
             end_pt: end_pt,
             domain: domain,
             units: units,
-            layer: edge.layer.display_name,
+            layer: SketchupModel::Query::Layer.entity_path(edge),
             sketchup_attributes: att,
             speckle_schema: speckle_schema,
             application_id: edge.persistent_id.to_s
           )
         end
 
-        # @param _state [States::State] state of the application.
+        # @param edge [Sketchup::Face] face to get base line from face.
+        def self.base_line_from_face(face, units, global_transformation: nil)
+          points = face.vertices.collect(&:position)
+          points_z_values = points.collect(&:z)
+          height = Geometry.length_to_speckle(points_z_values.max - points_z_values.min, units)
+          min_z = points_z_values.min
+          projected_points = points.map { |p| Geom::Point3d.new(p.x, p.y, min_z) }
+          distance_with_points = Struct.new(:distance, :point_1, :point_2)
+          lines_with_distances = []
+          projected_points.each do |p|
+            projected_points.each do |p_other|
+              next if p_other == p
+
+              lines_with_distances.append(distance_with_points.new(p.distance(p_other), p, p_other))
+            end
+          end
+          lines_with_distances.sort_by!(&:distance).reverse!
+          p_1 = lines_with_distances.first.point_1
+          p_2 = lines_with_distances.first.point_2
+          unless global_transformation.nil?
+            p_1 = p_1.transform!(global_transformation)
+            p_2 = p_2.transform!(global_transformation)
+          end
+          Line.new(
+            start_pt: Geometry::Point.from_vertex(p_1, units),
+            end_pt: Geometry::Point.from_vertex(p_2, units),
+            domain: Primitive::Interval.from_numeric(0, Geometry.length_to_speckle(p_1.distance(p_2), units), units),
+            units: units,
+            layer: SketchupModel::Query::Layer.entity_path(face),
+            sketchup_attributes: {},
+            speckle_schema: {},
+            application_id: face.persistent_id.to_s
+          )
+        end
+
+        # @param state [States::State] state of the application.
         # @param line [Object] object represents Speckle line.
         # @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
-        def self.to_native(state, line, entities, &_convert_to_native)
+        # 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']
             points = values.each_slice(3).to_a.map { |pt| Point.to_native(pt[0], pt[1], pt[2], line['units']) }
@@ -76,9 +113,10 @@ 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 = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == line['layer'] }
+          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 = line_layer unless line_layer.nil?
+            edge.layer = line_layer.nil? ? layer : line_layer
             unless line['sketchup_attributes'].nil?
               SketchupModel::Dictionary::BaseDictionaryHandler
                 .attribute_dictionaries_to_native(edge, line['sketchup_attributes']['dictionaries'])
@@ -87,6 +125,8 @@ module SpeckleConnector
           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)
@@ -94,6 +134,7 @@ module SpeckleConnector
             start_pt: start_point,
             end_pt: end_point,
             domain: domain,
+            layer: 'test',
             application_id: '',
             units: units
           )

speckle_connector/src/speckle_objects/geometry/mesh.rb

@@ -3,10 +3,14 @@
 require_relative '../base'
 require_relative '../geometry/bounding_box'
 require_relative '../other/render_material'
+require_relative '../../mapper/mapper'
 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
@@ -48,16 +52,36 @@ module SpeckleConnector
           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?
+          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
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity:
-        def self.to_native(state, mesh, entities, &convert_to_native)
+        def self.to_native(state, mesh, layer, entities, &convert_to_native)
           model_preferences = state.user_state.preferences[:model]
           # Get soft? flag of {Sketchup::Edge} object to understand smoothness of edge.
           is_soften = get_soften_setting(mesh, entities)
@@ -67,14 +91,22 @@ 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'],
+          state, _materials = Other::RenderMaterial.to_native(state, mesh['renderMaterial'], layer,
                                                               entities, &convert_to_native)
           # Find and assign material if exist
           unless mesh['renderMaterial'].nil?
@@ -86,18 +118,23 @@ 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 = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == mesh['layer'] }
+          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 }
+          # Merge only added faces in this scope
+          # if model_preferences[:merge_coplanar_faces]
+          #   added_faces = Converters::CleanUp.merge_coplanar_faces(added_faces)
+          # end
           added_faces.each do |face|
             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::BaseDictionaryHandler
                 .attribute_dictionaries_to_native(face, mesh['sketchup_attributes']['dictionaries'])
             end
           end
-          # Merge only added faces in this scope
-          if model_preferences[:merge_coplanar_faces]
-            added_faces = Converters::CleanUp.merge_coplanar_faces(added_faces)
-          end
+
           return state, added_faces
         end
         # rubocop:enable Metrics/MethodLength
@@ -111,21 +148,19 @@ module SpeckleConnector
         # @param global_transform [Geom::Transformation, nil] global transformation value of face if it is not included
         #  into any component.
         # rubocop:disable Style/MultilineTernaryOperator
-        def self.from_face(face:, units:, model_preferences:, global_transform: nil, parent_material: nil)
+        def self.from_face(speckle_state:, 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)
+          speckle_schema = Mapper.to_speckle(speckle_state, face, units, global_transformation: global_transform)
           material = face.material || face.back_material || parent_material
           speckle_mesh = Mesh.new(
             units: units,
             render_material: material.nil? ? nil : Other::RenderMaterial.from_material(material),
-            vertices: [],
-            faces: [],
-            sketchup_attributes: att,
-            layer: face.layer.display_name,
+            vertices: [], faces: [], sketchup_attributes: att,
+            layer: SketchupModel::Query::Layer.entity_path(face),
             speckle_schema: speckle_schema,
             application_id: face.persistent_id
           )

speckle_connector/src/speckle_objects/geometry/polycurve.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+require_relative '../../constants/type_constants'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Geometry
+      # Polycurve object definition for Speckle.
+      # It basically groups the lines-curves under it's `segments` property.
+      class Polycurve < Base
+        SPECKLE_TYPE = OBJECTS_GEOMETRY_POLYCURVE
+
+        def self.to_native(state, polycurve, layer, entities, &convert_to_native)
+          polycurve['displayValue'] = polycurve['segments']
+          convert_to_native.call(state, polycurve, layer, entities)
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/geometry/polyline.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require_relative 'length'
+require_relative 'point'
+require_relative 'bounding_box'
+require_relative '../base'
+require_relative '../primitive/interval'
+
+module SpeckleConnector
+  module SpeckleObjects
+    module Geometry
+      # Polyline object definition for Speckle.
+      class Polyline < Base
+        SPECKLE_TYPE = OBJECTS_GEOMETRY_POLYLINE
+
+        # @param value [Array<Numeric>] polygon vertex coordinates as flat list.
+        # @param domain [Primitive::Interval] domain of the polyline.
+        # @param length [Numeric] length of the polyline.
+        # @param closed [Boolean] whether polyline is closed or not.
+        # @param units [String] units of the polyline.
+        # @param application_id [String] application id of the polyline which corresponds to persistent_id of the Loop.
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(value:, domain:, length:, closed:, units:, application_id: nil)
+          super(
+            speckle_type: SPECKLE_TYPE,
+            total_children_count: 0,
+            application_id: application_id,
+            id: nil
+          )
+          self[:value] = value
+          self[:domain] = domain
+          self[:length] = length
+          self[:closed] = closed
+          self[:units] = units
+        end
+        # rubocop:enable Metrics/ParameterLists
+
+        # @param loop [Sketchup::Loop] loop to convert closed speckle polyline.
+        def self.from_loop(loop, units, global_transformation: nil)
+          points = loop.vertices.collect do |vertex|
+            position = vertex.position
+            position = vertex.position.transform!(global_transformation) unless global_transformation.nil?
+            position
+          end
+          values = points.collect do |p|
+            [Geometry.length_to_speckle(p.x, units),
+             Geometry.length_to_speckle(p.y, units),
+             Geometry.length_to_speckle(p.z, units)]
+          end.flatten
+          loop_length = loop.edges.sum(&:length)
+          length = Geometry.length_to_speckle(loop_length, units)
+          domain = Primitive::Interval.from_lengths(0, loop_length, units)
+          Polyline.new(
+            value: values,
+            domain: domain,
+            length: length,
+            units: units,
+            closed: true,
+            application_id: loop.persistent_id.to_s
+          )
+        end
+      end
+    end
+  end
+end

speckle_connector/src/speckle_objects/geometry/vector.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'length'
 require_relative '../base'
 
 module SpeckleConnector
@@ -25,6 +26,14 @@ module SpeckleConnector
           self[:z] = z
           self[:units] = units
         end
+
+        def self.to_native(x, y, z, units)
+          Geom::Vector3d.new(
+            Geometry.length_to_native(x, units),
+            Geometry.length_to_native(y, units),
+            Geometry.length_to_native(z, units)
+          )
+        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

@@ -75,7 +75,7 @@ module SpeckleConnector
           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,
@@ -98,7 +98,7 @@ module SpeckleConnector
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
-        def self.to_native(state, definition_obj, _entities, &convert_to_native)
+        def self.to_native(state, definition_obj, layer, _entities, &convert_to_native)
           sketchup_model = state.sketchup_state.sketchup_model
 
           # FIXME: Check later this is a valid check or not. Maybe unnecessary? If necessary document it!
@@ -107,16 +107,10 @@ module SpeckleConnector
           application_id = definition_obj['applicationId']
           definition = sketchup_model.definitions[definition_name]
 
-          # 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.
-          children_changed = false
-          unless definition.nil?
-            previous_speckle_id = definition.get_attribute(SPECKLE_BASE_OBJECT, 'speckle_id')
-            children_changed = previous_speckle_id != definition_obj['id']
-          end
+          # Check any entities of definition changed
+          entities_updated = entities_updated?(definition, definition_obj)
 
-          if definition && !children_changed &&
+          if definition && !entities_updated &&
              (definition.name == definition_name || definition.guid == application_id)
             return state, [definition]
           end
@@ -128,13 +122,23 @@ module SpeckleConnector
           definition&.entities&.clear!
           definition ||= sketchup_model.definitions.add(definition_name)
 
+          ngon_faces = []
           if geometry.is_a?(Array)
             geometry.each do |obj|
-              state = convert_to_native.call(state, obj, definition.entities)
+              state, added_entities = convert_to_native.call(state, obj, layer, definition.entities)
+              if added_entities.length == 1 && added_entities.first.is_a?(Sketchup::Face)
+                ngon_faces.append(added_entities.first)
+              end
+            end
+          end
+          ngon_faces.each do |f|
+            f.edges.each do |e|
+              e.soft = false
+              e.smooth = false
             end
           end
           if geometry.is_a?(Hash) && !definition_obj['speckle_type'].nil?
-            state = convert_to_native.call(state, geometry, definition.entities)
+            state, _converted_entities = convert_to_native.call(state, geometry, layer, definition.entities)
           end
           # puts("definition finished: #{name} (#{application_id})")
           # puts("    entity count: #{definition.entities.count}")
@@ -155,6 +159,7 @@ module SpeckleConnector
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
         def self.group_entities_to_speckle(entities, preferences, speckle_state, parent, &convert)
+          entities = entities.reject(&:hidden?)
           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)
@@ -216,6 +221,19 @@ module SpeckleConnector
           new_speckle_state
         end
         # rubocop:enable Metrics/ParameterLists
+
+        # 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
+          children_changed
+        end
       end
     end
   end

speckle_connector/src/speckle_objects/other/block_instance.rb

@@ -7,6 +7,7 @@ require_relative '../base'
 require_relative '../geometry/bounding_box'
 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
@@ -61,7 +62,7 @@ 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: group.layer.display_name,
+            layer: SketchupModel::Query::Layer.entity_path(group),
             sketchup_attributes: att,
             speckle_schema: speckle_schema,
             application_id: group.guid
@@ -97,7 +98,7 @@ module SpeckleConnector
                              end,
             transform: Other::Transform.from_transformation(component_instance.transformation, units),
             block_definition: block_definition,
-            layer: component_instance.layer.display_name,
+            layer: SketchupModel::Query::Layer.entity_path(component_instance),
             sketchup_attributes: att,
             speckle_schema: speckle_schema,
             application_id: component_instance.persistent_id.to_s
@@ -111,7 +112,7 @@ module SpeckleConnector
         # @param block [Object] block object that represents Speckle block.
         # @param layer [Sketchup::Layer] layer to add {Sketchup::Edge} into it.
         # @param entities [Sketchup::Entities] entities collection to add {Sketchup::Edge} into it.
-        def self.to_native(state, block, entities, &convert_to_native)
+        def self.to_native(state, block, layer, entities, &convert_to_native)
           # is_group = block.key?("is_sketchup_group") && block["is_sketchup_group"]
           # something about this conversion is freaking out if nested block geo is a group
           # so this is set to false always until I can figure this out
@@ -123,6 +124,7 @@ module SpeckleConnector
           state, _definitions = BlockDefinition.to_native(
             state,
             block_definition,
+            layer,
             entities,
             &convert_to_native
           )
@@ -130,8 +132,10 @@ module SpeckleConnector
           definition = state.sketchup_state.sketchup_model
                             .definitions[BlockDefinition.get_definition_name(block_definition)]
 
-          block_layer = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == block['layer'] }
-          return add_instance_from_definition(state, block, 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)
@@ -166,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 unless layer.nil?
+                       group.layer = block_layer.nil? ? layer : block_layer
                        group
                        # rubocop:enable SketchupSuggestions/AddGroup
                      else
                        instance = entities.add_instance(definition, transform)
-                       instance.layer = layer unless layer.nil?
+                       instance.layer = block_layer.nil? ? layer : block_layer
                        instance
                      end
 
@@ -187,7 +192,7 @@ 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'],
+          state, _materials = Other::RenderMaterial.to_native(state, block['renderMaterial'], layer,
                                                               entities, &convert_to_native)
 
           # Retrieve material from state

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,35 @@
+# 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

@@ -22,9 +22,15 @@ module SpeckleConnector
 
           return format_naming_convention([family, type, category, element_id]) unless element_id.nil?
 
-          return "def::#{def_obj['applicationId']}" unless def_obj['applicationId'].nil?
+          name = def_obj['name']
+          return "#{name}::#{def_obj['applicationId']}" if !name.nil? && !def_obj['applicationId'].nil?
 
-          return "def::#{def_obj['id']}"
+          return "#{name}::#{def_obj['id']}" unless name.nil?
+
+          speckle_type = def_obj['speckle_type'].split('.').last
+          return "#{speckle_type}::#{def_obj['applicationId']}" unless def_obj['applicationId'].nil?
+
+          return "#{speckle_type}::#{def_obj['id']}"
         end
 
         def self.format_naming_convention(entries)
@@ -41,42 +47,55 @@ module SpeckleConnector
           name
         end
 
+        # Get instance name as speckle_type if it is structured as `speckle_type::application_id`
+        def self.get_instance_name(definition_name)
+          return definition_name unless definition_name.include?('::')
+
+          definition_name.split('::').first
+        end
+
         # Creates a component definition and instance from a speckle object with a display value
         # @param state [States::State] state of the application.
-        def self.to_native(state, obj, entities, &convert_to_native)
+        def self.to_native(state, obj, layer, entities, &convert_to_native)
           # Switch displayValue with geometry
           obj = collect_definition_geometries(obj)
           obj['name'] = get_definition_name(obj)
 
           state, _definitions = BlockDefinition.to_native(
-            state,
-            obj,
-            entities,
-            &convert_to_native
+            state, obj, layer, entities, &convert_to_native
           )
 
           definition = state.sketchup_state.sketchup_model.definitions[BlockDefinition.get_definition_name(obj)]
 
           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'])
+          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.name = get_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)
+          # 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|
-              # Mullions is a special case here, they are extracted as base object with @displayValue from revit..
-              if element['@displayValue'].nil?
-                obj['geometry'].append(element)
-              else
-                obj['geometry'] += element['@displayValue']
+          elements = obj['elements'] || obj['@elements']
+
+          # if only elements are there then assign only elements, there are some cases that RevitWalls can only
+          # have elements instead of display value
+          if obj['geometry'].nil? && !elements.nil?
+            obj['geometry'] = elements
+          else
+            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)
+                else
+                  obj['geometry'] += element['@displayValue']
+                end
               end
             end
           end

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,
@@ -50,7 +50,7 @@ module SpeckleConnector
         end
 
         # @param state [States::State] state of the application.
-        def self.to_native(state, render_material, _entities, &_convert_to_native)
+        def self.to_native(state, render_material, _layer, _entities, &_convert_to_native)
           return state, [] if render_material.nil?
 
           sketchup_model = state.sketchup_state.sketchup_model
@@ -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

@@ -10,7 +10,9 @@ module SpeckleConnector
       class Layer < Base
         SPECKLE_TYPE = 'Speckle.Core.Models.Collection'
 
-        def initialize(name:, visible:, is_folder:, color: nil, layers_and_folders: [], application_id: nil)
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(name:, visible:, is_folder:, full_path: nil, line_style: nil, color: nil, layers_and_folders: [],
+                       application_id: nil)
           super(
             speckle_type: SPECKLE_TYPE,
             total_children_count: 0,
@@ -21,31 +23,56 @@ module SpeckleConnector
           self[:color] = color
           self[:visible] = visible
           self[:is_folder] =  is_folder
+          self[:full_path] =  full_path unless full_path.nil?
+          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::Others::Color.to_native(speckle_layer['color']) if speckle_layer['color']
+          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? }
+        # Flat layer conversion.
+        def self.to_native_flat_layers(layers_relation, sketchup_model)
+          speckle_layers = layers_relation[:elements]
+
+          elements_to_layers(speckle_layers, sketchup_model)
+        end
+
+        # Converts elements to layers with it's full path.
+        def self.elements_to_layers(elements, sketchup_model)
+          elements.each do |element|
+            element[:name] = element[:full_path]
+            to_native_layer(element, sketchup_model.layers, sketchup_model)
+            elements_to_layers(element[:elements], sketchup_model) unless element[:elements].nil?
+          end
+        end
+
+        # Nested layer conversion with folders.
+        def self.to_native_layer_folder(layers_relation, folder, sketchup_model)
+          speckle_layers = layers_relation[: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 = layers_relation[: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?
+            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
@@ -69,7 +96,8 @@ module SpeckleConnector
             name: layer.display_name,
             visible: layer.visible?,
             is_folder: false,
-            color: SpeckleObjects::Others::Color.to_speckle(layer.color),
+            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

speckle_connector/src/speckle_objects/relations/layers.rb

@@ -22,10 +22,60 @@ module SpeckleConnector
           self[:elements] = layers
         end
 
-        def self.to_native(layers_relation, sketchup_model)
-          folder = sketchup_model.layers
+        # Extract relations from commit obj to create layers in advance.
+        # By doing this, also checks layers will be created as flat list or nested structure according to source app.
+        # @param commit_obj [Hash] commit object to extract layer relations.
+        # @param source_app [String] source application to decide layer creation strategy.
+        # Currently for
+        # - Revit: we don't create layers in advance because we create layers according to categories.
+        # - SketchUp: we create layers in advance as nested.
+        # - Rhino: we create layers in advance as flat list with it's full path.
+        def self.extract_relations(commit_obj, source_app)
+          return nil unless commit_obj['speckle_type'] == SPECKLE_CORE_MODELS_COLLECTION
 
-          SpeckleObjects::Relations::Layer.to_native_layer_folder(layers_relation, folder, sketchup_model)
+          elements = element_to_relation(commit_obj['elements'], source_app, [])
+
+          Layers.new(
+            active: commit_obj['active_layer'],
+            layers: elements
+          )
+        end
+
+        # rubocop:disable Metrics/CyclomaticComplexity
+        def self.element_to_relation(elements, source_app, parent_layers)
+          elements.collect do |element|
+            next unless element['speckle_type'] == SPECKLE_CORE_MODELS_COLLECTION
+
+            layers_tree = parent_layers.dup.append(element['name'])
+            full_path = ''
+            parent_layers.each { |parent| full_path += "#{parent}::" }
+            full_path += element['name']
+            # Add this info to commit object to check later layer_collection conversion
+            element['full_path'] = full_path if source_app.include?('rhino')
+
+            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, full_path: full_path,
+              layers_and_folders: element_to_relation(element['elements'], source_app, layers_tree)
+            )
+          end.compact
+        end
+        # rubocop:enable Metrics/CyclomaticComplexity
+
+        def self.to_native(obj, source_app, sketchup_model)
+          layers_relation = extract_relations(obj, source_app)
+          return if layers_relation.nil?
+
+          folder = sketchup_model.layers
+          is_flat = source_app.include?('rhino')
+
+          if is_flat
+            SpeckleObjects::Relations::Layer.to_native_flat_layers(layers_relation, sketchup_model)
+          else
+            SpeckleObjects::Relations::Layer.to_native_layer_folder(layers_relation, folder, sketchup_model)
+          end
 
           active_layer = folder.to_a.find { |layer| layer.display_name == layers_relation['active_layer'] }
           sketchup_model.active_layer = active_layer unless active_layer.nil?

speckle_connector/src/speckle_objects/revit/revit_definition.rb

@@ -15,15 +15,17 @@ module SpeckleConnector
             family = def_obj['family']
             type = def_obj['type']
             category = def_obj['category']
+            element_id = def_obj['elementId']
+            id = def_obj['id']
 
-            return "#{family}-#{type}-#{category}-#{def_obj['elementId']}"
+            return "#{family}-#{type}-#{category}-#{element_id}-#{id}"
           end
 
-          def self.to_native(state, definition, entities, &convert_to_native)
+          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?
-            SpeckleObjects::Other::BlockDefinition.to_native(state, definition, 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

@@ -16,12 +16,13 @@ module SpeckleConnector
           # @param block [Object] block object that represents Speckle block.
           # @param layer [Sketchup::Layer] layer to add {Sketchup::Edge} into it.
           # @param entities [Sketchup::Entities] entities collection to add {Sketchup::Edge} into it.
-          def self.to_native(state, block, entities, &convert_to_native)
+          def self.to_native(state, block, layer, entities, &convert_to_native)
             block_definition = block['definition']
 
             state, _definitions = RevitDefinition.to_native(
               state,
               block_definition,
+              layer,
               entities,
               &convert_to_native
             )
@@ -29,10 +30,11 @@ module SpeckleConnector
             definition = state.sketchup_state.sketchup_model
                               .definitions[RevitDefinition.get_definition_name(block_definition)]
 
-            layer = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == block['category'] }
+            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, layer, entities, definition, false, &convert_to_native
+              state, block, block_layer, layer, entities, definition, false, &convert_to_native
             )
           end
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../../base'
-
+require_relative '../../../../constants/type_constants'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -10,15 +10,13 @@ module SpeckleConnector
         module Models
           # Collection object that collect other speckle objects under it's elements.
           class Collection < Base
-            SPECKLE_TYPE = 'Speckle.Core.Models.Collection'
-
             # @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_TYPE,
+                speckle_type: SPECKLE_CORE_MODELS_COLLECTION,
                 total_children_count: 0,
                 application_id: application_id,
                 id: nil
@@ -27,6 +25,16 @@ module SpeckleConnector
               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

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

@@ -3,6 +3,7 @@
 require_relative 'collection'
 require_relative '../../../../sketchup_model/query/layer'
 require_relative '../../../other/color'
+require_relative '../../../other/display_style'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -12,7 +13,9 @@ module SpeckleConnector
           # LayerCollection object that collect other speckle objects under it's elements.
           class LayerCollection < Collection
             SPECKLE_TYPE = 'Speckle.Core.Models.Collection'
-            def initialize(name:, visible:, is_folder:, color: nil, elements: [], application_id: nil)
+            # 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',
@@ -22,7 +25,9 @@ module SpeckleConnector
               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|
@@ -55,13 +60,14 @@ module SpeckleConnector
                 name: layer.display_name,
                 visible: layer.visible?,
                 is_folder: false,
-                color: SpeckleObjects::Others::Color.to_speckle(layer.color),
+                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]
@@ -73,12 +79,10 @@ module SpeckleConnector
                     el[:name] == folder.display_name
                 end
                 if collection_candidate.nil?
-                  color = folder.respond_to?(:color) ? SpeckleObjects::Others::Color.to_speckle(folder.color) : 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
+                    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)
@@ -88,6 +92,25 @@ module SpeckleConnector
 
               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']
+              name = layer_collection['full_path'] if layer_collection['full_path']
+
+              layer = sketchup_model.layers.find { |l| l.display_name == name }
+              layer_or_folder = layer if layer
+
+              elements.each do |element|
+                new_state, _converted_entities = convert_to_native.call(state, element, layer_or_folder, entities)
+                state = new_state
+              end
+
+              return state, []
+            end
           end
         end
       end

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

@@ -4,6 +4,7 @@ require_relative 'collection'
 require_relative 'layer_collection'
 require_relative '../../../built_elements/view3d'
 require_relative '../../../built_elements/revit/direct_shape'
+require_relative '../../../../mapper/mapper'
 
 module SpeckleConnector
   module SpeckleObjects
@@ -13,7 +14,9 @@ module SpeckleConnector
           # ModelCollection object that collect other speckle objects under it's elements.
           class ModelCollection < Collection
             DIRECT_SHAPE = SpeckleObjects::BuiltElements::Revit::DirectShape
+            QUERY = SketchupModel::Query
             VIEW3D = SpeckleObjects::BuiltElements::View3d
+            SPECKLE_SCHEMA_DICTIONARY_HANDLER = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler
             def initialize(name:, active_layer:, elements: [], application_id: nil)
               super(
                 name: name,
@@ -31,7 +34,8 @@ module SpeckleConnector
               )
 
               # Direct shapes will pass directly to elements which are already flattened with all children
-              model_collection[:elements] += collect_direct_shapes(sketchup_model, units, preferences)
+              model_collection[:elements] += collect_mapped_entities(speckle_state, sketchup_model, units,
+                                                                     preferences, &convert)
 
               # 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?
@@ -52,15 +56,52 @@ module SpeckleConnector
               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]]
+            # @param sketchup_model [Sketchup::Model] active model to retrieve and convert mapped entities.
+            def self.collect_mapped_entities(speckle_state, sketchup_model, units, preferences, &convert)
+              mapped_entities = Mapper.mapped_entities_on_selection(sketchup_model)
+              mapped_entities.collect do |entity_with_path|
+                convert_mapped_entity(speckle_state, entity_with_path, preferences, units)
               end
             end
+
+            def self.to_native(state, model_collection, layer, entities, &convert_to_native)
+              elements = model_collection['elements']
+              views = model_collection['@Views']
+              if views
+                views.each do |view|
+                  new_state, _converted_entities = convert_to_native.call(state, view, layer, entities)
+                  state = new_state
+                end
+              end
+
+              elements.each do |element|
+                new_state, _converted_entities = 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
+
+            def self.convert_mapped_entity(speckle_state, entity_with_path, preferences, units)
+              entity = entity_with_path[0]
+              path = entity_with_path[1..-1]
+
+              method = SPECKLE_SCHEMA_DICTIONARY_HANDLER.get_attribute(entity, 'method')
+
+              if !method.nil? && (method.include?('Floor') || method.include?('Wall')) && entity.is_a?(Sketchup::Face)
+                global_transformation = QUERY::Entity.global_transformation(entity, path)
+                floor = SpeckleObjects::Geometry::Mesh.from_face(speckle_state: speckle_state, face: entity,
+                                                                 units: units, model_preferences: preferences,
+                                                                 global_transform: global_transformation)
+                return [floor, [entity]]
+              end
+
+              direct_shape = DIRECT_SHAPE.from_entity(speckle_state, entity, path, units, preferences)
+              return [direct_shape, [entity]]
+            end
           end
         end
       end

speckle_connector/src/states/speckle_mapper_state.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative '../immutable/immutable'
+require_relative '../callbacks/callback_message'
+require_relative '../speckle_entities/speckle_entity'
+require_relative '../mapper/mapper_source'
+
+module SpeckleConnector
+  module States
+    # State of the speckle on ruby.
+    class SpeckleMapperState
+      include Immutable::ImmutableUtils
+
+      # @return [ImmutableHash{Integer=>Sketchup::Entity}] persistent_id of the sketchup entity and itself
+      attr_reader :mapped_entities
+
+      # @return [Mapper::MapperSource] source of the mapper.
+      attr_reader :mapper_source
+
+      def initialize
+        @mapped_entities = Immutable::EmptyHash
+        @mapper_source = nil
+      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_mapped_entities(new_mapped_entities)
+        with(:@mapped_entities => new_mapped_entities)
+      end
+
+      def with_mapper_source(mapper_source)
+        # TODO: Check/Sync here parameters of the mapped entities.
+        with(:@mapper_source => mapper_source)
+      end
+    end
+  end
+end

speckle_connector/src/states/speckle_state.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'speckle_mapper_state'
 require_relative '../immutable/immutable'
 require_relative '../callbacks/callback_message'
 require_relative '../speckle_entities/speckle_entity'
@@ -10,13 +11,13 @@ module SpeckleConnector
     class SpeckleState
       include Immutable::ImmutableUtils
 
+      # @return [States::SpeckleMapperState] state of the mapper.
+      attr_reader :speckle_mapper_state
+
       # @return [ImmutableHash{Integer=>SpeckleEntities::SpeckleEntity}] persistent_id of the sketchup entity and
       #  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
 
@@ -47,10 +48,10 @@ module SpeckleConnector
         @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
+        @speckle_mapper_state = SpeckleMapperState.new
       end
 
       # @param callback_name [String] name of the callback command
@@ -68,13 +69,13 @@ module SpeckleConnector
         with(:@message_queue => new_queue)
       end
 
-      def with_selection_queue(selection_parameters)
+      def with_mapper_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
+      def with_mapper_deselection_queue
         new_queue = message_queue.merge({ "entitiesDeselected": 'entitiesDeselected()' })
         with(:@message_queue => new_queue)
       end
@@ -95,14 +96,29 @@ module SpeckleConnector
         with(:@accounts => new_accounts)
       end
 
+      def with_mapper_source(mapper_source)
+        new_speckle_mapper_state = speckle_mapper_state.with_mapper_source(mapper_source)
+        with(:@speckle_mapper_state => new_speckle_mapper_state)
+      end
+
+      def with_removed_mapper_source
+        new_speckle_mapper_state = speckle_mapper_state.with_mapper_source(nil)
+        with(:@speckle_mapper_state => new_speckle_mapper_state)
+      end
+
       def with_mapped_entity(entity)
-        new_mapped_entities = mapped_entities.put(entity.persistent_id, entity)
-        with_mapped_entities(new_mapped_entities)
+        new_speckle_mapper_state = speckle_mapper_state.with_mapped_entity(entity)
+        with(:@speckle_mapper_state => new_speckle_mapper_state)
       end
 
       def with_removed_mapped_entity(entity)
-        new_mapped_entities = mapped_entities.delete(entity.persistent_id)
-        with_mapped_entities(new_mapped_entities)
+        new_speckle_mapper_state = speckle_mapper_state.with_removed_mapped_entity(entity)
+        with(:@speckle_mapper_state => new_speckle_mapper_state)
+      end
+
+      def with_mapped_entities(new_mapped_entities)
+        new_speckle_mapper_state = speckle_mapper_state.with_mapped_entities(new_mapped_entities)
+        with(:@speckle_mapper_state => new_speckle_mapper_state)
       end
 
       def with_speckle_entity(traversed_entity)
@@ -114,10 +130,6 @@ 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

@@ -41,11 +41,11 @@ module SpeckleConnector
         with(:@speckle_state => new_speckle_state)
       end
 
-      def with_selection_queue(selection_parameters)
+      def with_mapper_selection_queue(selection_parameters)
         new_speckle_state = if selection_parameters[:selection].any?
-                              speckle_state.with_selection_queue(selection_parameters)
+                              speckle_state.with_mapper_selection_queue(selection_parameters)
                             else
-                              speckle_state.with_deselection_queue
+                              speckle_state.with_mapper_deselection_queue
                             end
         with(:@speckle_state => new_speckle_state)
       end

speckle_connector/src/ui/vue_view.rb

@@ -16,6 +16,7 @@ require_relative '../commands/model_preferences_updated'
 require_relative '../commands/activate_diffing'
 require_relative '../commands/apply_mappings'
 require_relative '../commands/clear_mappings'
+require_relative '../commands/mapper_source_updated'
 
 require_relative '../actions/reload_accounts'
 require_relative '../actions/load_saved_streams'
@@ -29,6 +30,7 @@ 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'
+require_relative '../actions/clear_mapper_source'
 
 module SpeckleConnector
   module Ui
@@ -89,7 +91,9 @@ module SpeckleConnector
           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)
+          show_all_entities: Commands::ActionCommand.new(@app, Actions::ShowAllEntities),
+          mapper_source_updated: Commands::MapperSourceUpdated.new(@app),
+          clear_mapper_source: Commands::ActionCommand.new(@app, Actions::ClearMapperSource)
         }.freeze
       end
       # rubocop:enable Metrics/MethodLength

ui/src/App.vue

@@ -15,7 +15,7 @@
         >
           <v-tabs-slider class="mx-sm-1"></v-tabs-slider>
           <v-tab href="#streams">
-            {{"Streams"}}
+            {{ streamsText }}
           </v-tab>
           <v-tab href="#mapper">
             {{"Mapper"}}
@@ -88,7 +88,7 @@
               <v-text-field
                   v-model="streamSearchQuery"
                   prepend-inner-icon="mdi-magnify"
-                  label="Search streams"
+                  :label="searchText"
                   background-color="background"
                   hide-details
                   clearable
@@ -101,6 +101,7 @@
             </v-container>
             <create-stream-dialog
                 v-if="accounts().length !== 0"
+                :is-f-e2="preferences && preferences.user && preferences.user.fe2"
                 :account-id="activeAccount().userInfo.id"
                 :server-url="activeAccount().serverInfo.url"
             />
@@ -115,7 +116,7 @@
         </v-tab-item>
         <v-tab-item :key="2" value="mapper">
           <v-card flat>
-            <mapper></mapper>
+            <mapper :stream-text="streamText" :branch-text="branchText"></mapper>
           </v-card>
         </v-tab-item>
       </v-tabs-items>
@@ -174,7 +175,7 @@ export default {
     size: {
       type: Number,
       default: 42
-    },
+    }
   },
   data() {
     return {
@@ -183,7 +184,11 @@ export default {
       createStreamByIdDialog: false,
       createStreamByIdText: "",
       preferences: {},
-      tab: "streams"
+      tab: "streams",
+      searchText: '',
+      streamsText: 'Streams',
+      streamText: 'Stream',
+      branchText: 'Branch'
     }
   },
   computed: {
@@ -209,8 +214,11 @@ export default {
     })
 
     bus.$on('update-preferences', async (preferences) => {
-      let prefs = JSON.parse(preferences)
-      this.preferences = prefs
+      this.preferences = JSON.parse(preferences)
+      this.searchText = this.preferences.user.fe2 ? 'Search projects' : 'Search streams'
+      this.streamsText = this.preferences.user.fe2 ? 'Projects' : 'Streams'
+      this.streamText = this.preferences.user.fe2 ? 'Project' : 'Stream'
+      this.branchText = this.preferences.user.fe2 ? 'Model' : 'Branch'
       this.$vuetify.theme.dark = this.preferences.user.dark_theme
     })
 

ui/src/components/MappedElements.vue

@@ -165,6 +165,7 @@ export default {
     return {
       isIsolated: false,
       elementSelection: {},
+      categorySelection: [],
       mappedEntities: [],
       mappedEntityCount: 0,
       // Expanded indexes for mapped element table (Categories)
@@ -181,9 +182,9 @@ export default {
     }
   },
   computed: {
-    categorySelection() {
-        return Object.keys(this.elementSelection)
-    },
+    // categorySelection() {
+    //     return Object.keys(this.elementSelection)
+    // },
   },
   mounted() {
     sketchup.exec({name: "collect_mapped_entities", data: {}})
@@ -231,26 +232,36 @@ export default {
         // }
     },
     clearMappingsFromTableSelection(){
-        sketchup.exec({ name: "clear_mappings_from_table", data: this.elementSelection })
+      sketchup.exec({ name: "clear_mappings_from_table", data: this.elementSelection })
+      this.$mixpanel.track('MappingsAction', { name: 'Mappings Clear' })
     },
     isolateMappedElementsOnSketchup(){
       if (this.isIsolated){
         this.isIsolated = false
         sketchup.exec({ name: "show_all_entities", data: {} })
+        this.$mixpanel.track('MappingsAction', { name: 'Mappings Un-Isolate' })
       } else {
         this.isIsolated = true
         sketchup.exec({ name: "isolate_mappings_from_table", data: this.elementSelection })
+        this.$mixpanel.track('MappingsAction', { name: 'Mappings Isolate' })
       }
     },
     hideMappedElementsOnSketchup(){
-        sketchup.exec({ name: "hide_mappings_from_table", data: this.elementSelection })
+      sketchup.exec({ name: "hide_mappings_from_table", data: this.elementSelection })
+      this.$mixpanel.track('MappingsAction', { name: 'Mappings Hide' })
     },
     selectMappedElementsOnSketchup(){
-        sketchup.exec({ name: "select_mappings_from_table", data: this.elementSelection })
+      sketchup.exec({ name: "select_mappings_from_table", data: this.elementSelection })
+      this.$mixpanel.track('MappingsAction', { name: 'Mappings Select Elements' })
     },
+    // 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

ui/src/components/Mapper.vue

@@ -58,6 +58,41 @@
         </v-expansion-panel-content>
       </v-expansion-panel>
 
+      <v-expansion-panel key="source">
+        <v-expansion-panel-header class="flex">
+          <v-container class="ma-0 pa-0">
+            <v-icon>
+              mdi-source-branch
+            </v-icon>
+            {{ `Source` }}
+            <v-tooltip right>
+              <template #activator="{ on, attrs }">
+                <v-btn
+                    class="ma-0 ml-1"
+                    height="20px"
+                    width="20px"
+                    icon
+                    x-small
+                    :color="getSourceStateIconColor()"
+                    v-bind="attrs"
+                    v-on="on"
+                    @click="refreshSourceBranch"
+                >
+                  <v-icon>
+                    {{ getSourceStateIcon() }}
+                  </v-icon>
+                </v-btn>
+              </template>
+              <span>{{ getSourceStateToolTip() }}</span>
+            </v-tooltip>
+
+          </v-container>
+        </v-expansion-panel-header>
+        <v-expansion-panel-content>
+          <mapper-source :stream-text="streamText" :branch-text="branchText" :source-state="this.sourceState"/>
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+
       <v-expansion-panel key="mapping">
         <v-expansion-panel-header>
           <div>
@@ -124,12 +159,52 @@
               class="pt-0"
               label="Mapper Method"
               :disabled="!entitySelected"
-              :items="enabledMethods"
+              :items="availableMethods"
+              density="compact"
+              clearable
+              @change="onSelectedMethodChange"
+          ></v-autocomplete>
+
+          <v-autocomplete
+              v-if="familySelectionActive"
+              v-model="selectedFamily"
+              class="pt-0"
+              label="Family"
+              :disabled="!entitySelected"
+              :items="families"
+              density="compact"
+              clearable
+              @change="onSelectedFamilyChange"
+          ></v-autocomplete>
+
+          <v-autocomplete
+              v-if="typeSelectionActive"
+              v-model="selectedFamilyType"
+              class="pt-0"
+              label="Type"
+              :disabled="!entitySelected"
+              item-value="type"
+              item-text="type"
+              :items="familyTypes"
               density="compact"
               clearable
           ></v-autocomplete>
 
           <v-autocomplete
+              v-if="levelSelectionActive"
+              v-model="selectedLevel"
+              class="pt-0"
+              label="Base Level"
+              :disabled="!entitySelected"
+              :items="levels"
+              item-value="name"
+              item-text="name"
+              density="compact"
+              clearable
+          ></v-autocomplete>
+
+          <v-autocomplete
+              v-if="categorySelectionActive"
               v-model="selectedCategory"
               class="pt-0"
               label="Category"
@@ -142,6 +217,7 @@
           ></v-autocomplete>
 
           <v-text-field
+              v-if="nameSelectionActive"
               v-model="name"
               class="pt-0"
               label="Name"
@@ -153,6 +229,7 @@
             <v-row justify="center" align="center">
               <v-col cols="auto" class="pa-1 pb-2">
                 <v-btn
+                    small
                     :disabled="!entitySelected"
                     @click="applyMapping"
                 >
@@ -163,6 +240,7 @@
               </v-col>
               <v-col cols="auto" class="pa-1 pb-2">
                 <v-btn
+                    small
                     :disabled="!entitySelected"
                     @click="clearMapping"
                 >
@@ -173,10 +251,7 @@
               </v-col>
             </v-row>
 
-
           </v-container>
-
-
         </v-expansion-panel-content>
       </v-expansion-panel>
 
@@ -204,6 +279,12 @@
 /*global sketchup*/
 import {bus} from "@/main";
 import {groupBy} from "@/utils/groupBy";
+import MappingSource from "@/components/MapperSource.vue";
+import {sourceMap} from "@vue/cli-service/lib/config/terserOptions";
+
+global.mapperSourceUpdated = function (streamId, levels, types) {
+  console.log(`Mapper source updated for ${streamId}.`)
+}
 
 global.entitySelected = function (selectionParameters) {
   bus.$emit('entities-selected', JSON.stringify(selectionParameters))
@@ -219,12 +300,35 @@ global.mappedEntitiesUpdated = function (mappedEntities) {
 
 export default {
   name: "Mapper",
+  props: {
+    streamText: {
+      type: String,
+      default: ''
+    },
+    branchText: {
+      type: String,
+      default: ''
+    }
+  },
   components: {
+    MapperSource: () => import('@/components/MapperSource.vue'),
     GlobalToast: () => import('@/components/GlobalToast'),
     MappedElements: () => import('@/components/MappedElements.vue')
   },
   data() {
     return {
+      nativeFaceMethods: ['Floor', 'Wall'],
+      nativeEdgeMethods: ['Column', 'Beam', 'Brace', 'Pipe', 'Duct'],
+      nativeDefaultFaceMethods: ['Default Floor', 'Default Wall'],
+      nativeDefaultEdgeMethods: ['Default Column', 'Default Beam', 'Default Brace', 'Default Pipe', 'Default Duct'],
+
+      familySelectionActive: false,
+      typeSelectionActive: false,
+      levelSelectionActive: false,
+      categorySelectionActive: false,
+      nameSelectionActive: false,
+
+      sourceState: 'Not Set',
       // Expanded indexes for selection table (Types)
       selectionExpandedIndexes: [],
       // Expanded indexes for mapped element table (Categories)
@@ -239,15 +343,26 @@ export default {
       entitySelected: false,
       selectedEntityCount: 0,
       selectedEntities: [],
+      allFamilyTypes: {},
+      familyTypes: [],
       lastSelectedEntity: null,
+
       selectedMethod: null,
       selectedCategory: null,
+      selectedFamily: null,
+      selectedFamilyType: null,
+      selectedLevel: null,
       name: "",
-      enabledMethods: [],
+
+      availableMethods: [],
       availableCategories: [],
+      families: [],
+      allTypes: {},
+      levels: [],
+
       mappedEntityCount: 0,
       mappedEntities: [],
-      panel: [1],
+      panel: [2],
       selectionHeaders: [
         { text: 'Type', sortable: false, value: 'entityType', width: '60%' },
         { text: 'Count', sortable: false, align: 'center', value: 'count', width: '20%' },
@@ -354,8 +469,145 @@ export default {
     }
   },
   methods:{
+    getSourceStateIcon(){
+      switch (this.sourceState){
+        case "Not Set":
+          return `mdi-cloud-off-outline`;
+        case "Set":
+          return `mdi-checkbox-marked-circle-outline`;
+        case "Outdated":
+          return `mdi-update`;
+        default:
+          break;
+      }
+    },
+    getSourceStateToolTip(){
+      switch (this.sourceState){
+        case "Not Set":
+          return 'Source disconnected.';
+        case "Set":
+          return 'Source connected.';
+        case "Outdated":
+          return 'Source branch is not up-to-date!';
+        default:
+          break;
+      }
+    },
+    getSourceStateIconColor(){
+      switch (this.sourceState){
+        case "Not Set":
+          return `grey`;
+        case "Set":
+          return `green`;
+        case "Outdated":
+          return `red`;
+        default:
+          break;
+      }
+    },
+    onSelectedMethodChange(){
+      this.hideOptionalMappingInputs()
+      this.updateMappingInputs()
+      this.getFamiliesFromSelectedMethod()
+      this.getTypesFromSelectedFamily()
+      this.$mixpanel.track('MappingsAction', { name: 'Mappings Set', schema: this.selectedMethod })
+    },
+    onSelectedFamilyChange(){
+      this.getTypesFromSelectedFamily();
+    },
+    updateMappingInputs(){
+      if (this.selectedMethod === null){
+        this.typeSelectionActive = false
+        this.familySelectionActive = false
+        this.levelSelectionActive = false
+        this.categorySelectionActive = false
+        this.nameSelectionActive = false
+        return
+      }
+      const nativeDefaultMethods = this.nativeDefaultEdgeMethods.concat(this.nativeDefaultFaceMethods)
+      const nativeMethods = this.nativeEdgeMethods.concat(this.nativeFaceMethods)
+
+      if (this.selectedMethod === 'Direct Shape'){
+        this.categorySelectionActive = true
+        this.nameSelectionActive = true
+      }
+      else if (nativeDefaultMethods.includes(this.selectedMethod)){
+        this.typeSelectionActive = false
+        this.familySelectionActive = false
+        this.levelSelectionActive = false
+        this.categorySelectionActive = false
+        this.nameSelectionActive = false
+      }
+      else if (nativeMethods.includes(this.selectedMethod)){
+        this.typeSelectionActive = true
+        this.familySelectionActive = true
+        this.levelSelectionActive = true
+      }
+    },
+    getTypesFromSelectedFamily(){
+      this.familyTypes = this.allFamilyTypes[this.selectedFamily]
+      this.selectedFamilyType = this.familyTypes[0].type
+      if (this.selectedFamily === null || this.selectedFamily === undefined){
+        this.selectedFamily = this.families[0]
+      }
+      if (this.familyTypes === null ||this.familyTypes === undefined){
+        this.familyTypes = this.allFamilyTypes[this.selectedFamily]
+      }
+      if (this.selectedFamilyType === null || this.selectedFamilyType === undefined){
+        this.selectedFamilyType = this.familyTypes[0].type
+      }
+    },
+    getFamiliesFromSelectedMethod(){
+      switch (this.selectedMethod) {
+        case 'Floor':
+          this.families = Object.keys(this.allTypes['Floors']);
+          this.allFamilyTypes = this.allTypes['Floors']
+          break;
+        case 'Wall':
+          this.families = Object.keys(this.allTypes['Walls']);
+          this.allFamilyTypes = this.allTypes['Walls']
+          break;
+        case 'Column':
+          this.families = Object.keys(this.allTypes['Columns']);
+          this.allFamilyTypes = this.allTypes['Columns']
+          break;
+        case 'Beam':
+          this.families = Object.keys(this.allTypes['Beams']);
+          this.allFamilyTypes = this.allTypes['Beams']
+          break;
+        case 'Pipe':
+          this.families = Object.keys(this.allTypes['Piping System']);
+          this.allFamilyTypes = this.allTypes['Piping System']
+          break;
+        case 'Duct':
+          this.families = Object.keys(this.allTypes['Duct System']);
+          this.allFamilyTypes = this.allTypes['Duct System']
+          break;
+        default:
+          break;
+      }
+      if (this.selectedFamily === null || this.selectedFamily === undefined){
+        this.selectedFamily = this.families[0]
+      }
+      if (this.selectedLevel === null || this.selectedLevel === undefined){
+        this.selectedLevel = this.levels[0].name
+      }
+    },
+    hideOptionalMappingInputs(){
+      this.categorySelectionActive = false
+      this.nameSelectionActive = false
+      this.typeSelectionActive = false
+      this.familySelectionActive = false
+      this.levelSelectionActive = false
+    },
+    refreshSourceBranch(){
+      if (this.sourceState === 'Outdated'){
+        bus.$emit('refresh-source-branch')
+        this.$mixpanel.track('MappingsAction', { name: 'Mappings Source Update' })
+      }
+    },
     clearInputs(){
-      this.enabledMethods = []
+      this.availableMethods = []
       this.availableCategories = []
       this.selectedEntities = []
       this.selectionTableData = []
@@ -365,6 +617,11 @@ export default {
       this.selectedCategory = null
       this.entityMapped = false
       this.definitionMapped = false
+      this.selectedLevel = null
+      this.selectedFamily = null
+      this.selectedFamilyType = null
+      this.allTypes = null
+      this.familyTypes = null
     },
     getSelectionTableData(){
       let groupByClass = groupBy('entityType')
@@ -403,12 +660,12 @@ export default {
       return summary
     },
     setInputValuesFromSelection(){
+      // Clear all inputs if entity is not selected.
       if (!this.entitySelected){
-        this.name = ""
-        this.selectedMethod = null
-        this.selectedCategory = null
+        this.clearMappingInputs()
         return
       }
+      // Check if definition card is selected and set definition mappings.
       if (this.definitionSelected) {
         if (!this.definitionMapped){
           if (this.selectedEntityCount > 1){
@@ -416,7 +673,7 @@ export default {
           }else{
             this.name = this.lastSelectedEntity['definition']['entityName']
           }
-          this.selectedMethod = 'Direct Shape'
+          // this.selectedMethod = 'Direct Shape'
           this.selectedCategory = 49
         } else {
           if (this.selectedEntityCount > 1){
@@ -427,14 +684,20 @@ export default {
           this.selectedMethod = this.lastSelectedEntity['definition']['schema']['method']
           this.selectedCategory = this.lastSelectedEntity['definition']['schema']['category']
         }
-      } else {
+      }
+      // Otherwise set entity mappings.
+      else
+      {
         if (!this.entityMapped){
           if (this.selectedEntityCount > 1){
             this.name = '<Mixed>'
           }else{
             this.name = this.lastSelectedEntity['entityName']
           }
-          this.selectedMethod = 'Direct Shape'
+          console.log("entity not mapped")
+          this.updateMappingInputs()
+          this.getFamiliesFromSelectedMethod()
+          this.getTypesFromSelectedFamily()
           this.selectedCategory = 49
         } else {
           if (this.selectedEntityCount > 1){
@@ -443,7 +706,14 @@ export default {
             this.name = this.lastSelectedEntity['schema']['name']
           }
           this.selectedMethod = this.lastSelectedEntity['schema']['method']
+          console.log("entity is mapped")
+          this.updateMappingInputs()
+          this.selectedFamily = this.lastSelectedEntity['schema']['family']
           this.selectedCategory = this.lastSelectedEntity['schema']['category']
+          this.getFamiliesFromSelectedMethod()
+          this.getTypesFromSelectedFamily()
+          this.selectedFamilyType = this.lastSelectedEntity['schema']['family_type']
+          this.selectedLevel = this.lastSelectedEntity['schema']['level']
         }
       }
     },
@@ -482,10 +752,29 @@ export default {
         this.mappedElementsExpandedIndexes.push(slotData.item);
       }
     },
+    inputsReadyToApply(){
+      if (this.selectedMethod === null || this.selectedMethod === undefined){
+        return false;
+      }
+
+      const nativeMethods = this.nativeEdgeMethods.concat(this.nativeFaceMethods)
+
+      if (this.selectedMethod === 'Direct Shape'){
+        return this.selectedCategory !== null
+      }
+      else if (nativeMethods.includes(this.selectedMethod)){
+        return this.selectedFamily !== null &&
+            this.selectedFamilyType !== null &&
+            this.selectedLevel !== null
+      }
+      else {
+        return true;
+      }
+    },
     applyMapping(){
-      if (this.selectedMethod === null || this.selectedCategory === null){
+      if (!this.inputsReadyToApply()){
         this.$eventHub.$emit('error', {
-          text: 'Method and category are not set.\n'
+          text: 'Some inputs are not set to apply mapping.\n'
         })
         return
       }
@@ -493,6 +782,9 @@ export default {
         entitiesToMap: this.selectedEntities.map((entity) => entity['entityId']),
         method: this.selectedMethod,
         category:  this.selectedCategory,
+        family: this.selectedFamily,
+        familyType: this.selectedFamilyType,
+        level: this.selectedLevel,
         name: this.name,
         isDefinition: this.definitionSelected
       }
@@ -500,6 +792,8 @@ export default {
       this.$eventHub.$emit('success', {
         text: 'Mapping Applied.\n'
       })
+
+      this.$mixpanel.track('MappingsAction', { name: 'Mappings Applied' })
     },
     clearMapping(){
       const mapping = {
@@ -511,32 +805,66 @@ export default {
       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.$mixpanel.track('MappingsAction', { name: 'Mappings Clear' })
+    },
+    clearMappingInputs(){
+      this.selectedMethod = null
+      this.selectedCategory = null
+      this.name = ""
+      this.selectedFamily = null
+      this.selectedFamilyType = null
+      this.selectedLevel = null
+      this.familyTypes = null
+      this.levels = null
+      this.availableMethods = null
+      this.availableCategories = null
+      this.allTypes = null
+    },
+    getDataFromSelection(selectionParameters){
+      this.availableMethods = selectionParameters.mappingMethods
+      this.availableCategories = selectionParameters.categories
+      this.selectedEntities = selectionParameters.selection
+      this.allTypes = selectionParameters.types
+      this.levels = selectionParameters.levels
+      this.selectedLevel = selectionParameters.selectedLevelName
+    },
+    updateStatesFromSelectionData(){
       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
+    }
+  },
+  mounted() {
+    sketchup.exec({name: "collect_mapped_entities", data: {}})
+
+    bus.$on('entities-selected', async (selectionParameters) => {
+      // Parse data to json object
+      const selectionPars = JSON.parse(selectionParameters)
+      // Reset mapping inputs with nulls and empties.
+      this.clearMappingInputs()
+      // Get data from selection into objects and arrays. These data basically constructs the dropdowns.
+      this.getDataFromSelection(selectionPars)
+      // Update inner state of the mapper component according to selection data.
+      this.updateStatesFromSelectionData()
+      // Get selection table data.
       this.getSelectionTableData()
+      // Set mapping input values from selection data.
       this.setInputValuesFromSelection()
     })
     bus.$on('entities-deselected', async () => {
       this.entitySelected = false
       this.clearInputs()
+      this.hideOptionalMappingInputs()
     })
     bus.$on('mapped-entities-updated', async (mappedEntities) => {
       this.mappedEntityCount = mappedEntities.length
     })
+    bus.$on('set-source-up-to-date', (isUpToDate) => {
+      this.sourceState = isUpToDate
+    })
   }
 }
 </script>

ui/src/components/MapperSource.vue

@@ -0,0 +1,227 @@
+<template>
+  <v-container class="pa-0">
+    <v-autocomplete
+        v-model="sourceStreamId"
+        :label="streamText"
+        :items="allStreamsList"
+        item-text="name"
+        item-value="id"
+        density="compact"
+    ></v-autocomplete>
+
+    <v-autocomplete
+        v-model="sourceBranchId"
+        class="pt-0 mb-n5"
+        :label="branchText"
+        :items="allBranchesList"
+        :disabled="sourceStreamId === null"
+        item-text="name"
+        item-value="id"
+        density="compact"
+    ></v-autocomplete>
+
+    <v-container class="pa-0 mt-2">
+      <v-row justify="center" align="center">
+        <v-col cols="auto" class="pa-1 pb-2">
+          <v-btn
+              small
+              @click="applySource"
+          >
+            <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
+              small
+              :disabled="!sourceApplied"
+              @click="clearSource"
+          >
+            <v-icon dark left>
+              mdi-close-circle
+            </v-icon>Clear
+          </v-btn>
+        </v-col>
+      </v-row>
+
+    </v-container>
+  </v-container>
+</template>
+
+<script>
+/*global sketchup*/
+import gql from "graphql-tag";
+import streamQuery from "@/graphql/stream.gql";
+import {bus} from "@/main";
+import ObjectLoader from "@speckle/objectloader";
+
+const streamLimit = 20
+
+export default {
+  name: "MappingSource",
+  props: {
+    streamSearchQuery: { type: String, default: null },
+    sourceState: { type: String, default: 'Not Set' },
+    streamText: {
+      type: String,
+      default: ''
+    },
+    branchText: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      sourceApplied: false,
+      sourceStreamId: null,
+      sourceBranchId: null,
+      sourceStreamName: null,
+      sourceBranchName: null
+    }
+  },
+  apollo: {
+    streams: {
+      prefetch: true,
+      debounce: 300,
+      fetchPolicy: 'cache-and-network',
+      query: gql`
+        query Streams($query: String, $limit: Int, $cursor: String) {
+          streams(query: $query, limit: $limit, cursor: $cursor) {
+            totalCount
+            cursor
+            items {
+              id
+              name
+            }
+          }
+        }
+      `,
+      variables() {
+        return {
+          query: this.streamSearchQuery,
+          limit: streamLimit,
+          cursor: null
+        }
+      },
+      update(data) {
+        bus.$emit('streams-loaded')
+        this.showMoreEnabled = data.streams?.items.length < data.streams.totalCount
+        return data.streams
+      },
+    },
+    $subscribe: {
+      commitCreated: {
+        query: gql`
+          subscription ($streamId: String!) {
+            commitCreated(streamId: $streamId)
+          }
+        `,
+        variables() {
+          return {
+            streamId: this.sourceStreamId
+          }
+        },
+        result(data) {
+          if (data.data.commitCreated.sourceApplication.includes('Revit')){
+            if (data.data.commitCreated.branchName === this.selectedBranch.name){
+              this.afterCommitCreated()
+              this.$eventHub.$emit('notification', {
+                text: `A new commit was created on Revit!`,
+              })
+              this.$apollo.queries.stream.refetch()
+            }
+          }
+        },
+        skip() {
+            // Return true to skip the initial query execution
+            return this.sourceStreamId === null;
+        },
+      }
+    },
+    stream: {
+      query: streamQuery,
+      prefetch: true,
+      variables() {
+        return {
+          id: this.sourceStreamId
+        }
+      },
+      skip() {
+        // Return true to skip the initial query execution
+        return this.sourceStreamId === null;
+      },
+    }
+  },
+  computed: {
+    selectedBranch() {
+      if (!this.stream) return
+      return this.stream.branches.items.find((branch) => branch.id === this.sourceBranchId)
+    },
+    allStreamsList() {
+      if (this.$apollo.loading) return
+      return this.streams?.items
+    },
+    allBranchesList() {
+      if (this.$apollo.loading) return
+      return this.stream?.branches.items
+    },
+  },
+  mounted() {
+    bus.$on('refresh-source-branch', () => {
+      this.onSourceBranchChanged()
+      bus.$emit('set-source-up-to-date', 'Set')
+    })
+  },
+  methods: {
+    applySource(){
+      bus.$emit('set-source-up-to-date', 'Set')
+      this.onSourceBranchChanged()
+      this.$eventHub.$emit('success', {
+        text: 'Mapper source applied.\n'
+      })
+      this.$mixpanel.track('MappingsAction', { name: 'Mappings Source Apply' })
+    },
+    clearSource(){
+      sketchup.exec({name:"clear_mapper_source" , data: {}})
+      bus.$emit('set-source-up-to-date', 'Not Set')
+      this.sourceApplied = false
+      this.sourceBranchName = null
+      this.sourceStreamName = null
+      this.sourceBranchId = null
+      this.sourceStreamId = null
+      this.$eventHub.$emit('error', {
+        text: 'Mapper source cleared.\n'
+      })
+    },
+    afterCommitCreated(){
+      bus.$emit('set-source-up-to-date', 'Outdated')
+    },
+    async onSourceBranchChanged() {
+      const commitRefId = this.selectedBranch.commits.items[0]?.referencedObject
+      if (!commitRefId) { return }
+
+      const loader = new ObjectLoader({
+        serverUrl: localStorage.getItem('serverUrl'),
+        token: localStorage.getItem('SpeckleSketchup.AuthToken'),
+        streamId: this.sourceStreamId,
+        objectId: commitRefId
+      })
+
+      let rootObj = await loader.getAndConstructObject(this.updateLoadingStage)
+      sketchup.exec({name:"mapper_source_updated" , data: {
+          base: rootObj,
+          stream_id: this.sourceStreamId,
+          commit_id: commitRefId
+        }})
+      this.sourceApplied = true
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>

ui/src/components/StreamCard.vue

@@ -13,7 +13,7 @@
       <v-toolbar-title class="ml-0" style="position: relative; left: -10px">
         <!-- Uncomment when pinning is in place and add style="position: relative; left: -10px" to the element above :)  -->
         <v-btn
-          v-tooltip="'Pin this stream - it will be saved to this file.'"
+          v-tooltip="`Pin this ${streamText.toLowerCase()} - it will be saved to this file.`"
           icon
           x-small
           @click="toggleSavedStream"
@@ -66,7 +66,11 @@
         <template #activator="{ on, attrs }">
           <v-slide-x-transition>
             <div v-show="hover">
-              <create-branch-dialog :stream-name="stream.name" :stream-id="streamId"/>
+              <create-branch-dialog
+                  :is-f-e2="preferences && preferences.user && preferences.user.fe2"
+                  :stream-name="stream.name"
+                  :stream-id="streamId"
+              />
             </div>
           </v-slide-x-transition>
           <v-chip v-if="stream.branches" small v-bind="attrs" class="mr-1" v-on="on">
@@ -133,7 +137,7 @@
               hide-details
               dense
               flat
-              placeholder="Write your commit message here"
+              :placeholder="`Write your ${commitText.toLowerCase()} message here`"
             />
           </div>
         </v-slide-y-transition>
@@ -204,7 +208,11 @@ export default {
       commitId: 'latest',
       commitMessage: null,
       invalid: false,
-      diffing: false
+      diffing: false,
+      streamText: '',
+      branchText: '',
+      commitText: '',
+      preferences: {}
     }
   },
   apollo: {
@@ -286,6 +294,16 @@ export default {
     }
   },
   mounted() {
+    bus.$on('update-preferences', async (preferences) => {
+      const pref = JSON.parse(preferences)
+      this.preferences = pref
+      this.streamText = pref.user.fe2 ? 'Project' : 'Stream'
+      this.branchText = pref.user.fe2 ? 'Model' : 'Branch'
+      this.commitText = pref.user.fe2 ? 'Version' : 'Commit'
+    })
+    // Collect preferences to render UI according to it
+    sketchup.exec({name: "collect_preferences", data: {}})
+
     bus.$on(`deactivate-diffing-${this.streamId}`, () => {
       this.diffing = false
     })

ui/src/components/dialogs/CreateBranchDialog.vue

@@ -3,7 +3,7 @@
   <v-dialog v-model="showCreateBranch">
     <template #activator="{ on: dialog, attrs }">
       <v-btn
-          v-tooltip="'Create Branch'"
+          v-tooltip="`Create ${isFE2 ? 'Model' : 'Branch'}`"
           icon x-small class="ml-0 mr-1"
           v-bind="attrs"
           v-on="{...dialog}"
@@ -15,10 +15,10 @@
     </template>
     <v-card>
       <v-card-title class="text-h5 mb-1">
-        Create a New Branch
+        {{ `Create a New ${isFE2 ? 'Model' : 'Branch'}` }}
       </v-card-title>
       <v-card-subtitle class="py-0 my-0 font-italic">
-        under {{ streamName }} stream
+        {{ `under ${streamName} ${isFE2 ? 'project' : 'stream'}` }}
       </v-card-subtitle>
       <v-container class="px-6" pb-0>
         <v-text-field
@@ -27,7 +27,7 @@
             hide-details
             dense
             flat
-            placeholder="Branch Name"
+            :placeholder="`${isFE2 ? 'Model' : 'Branch'} Name`"
         />
         <v-text-field
             v-model="description"
@@ -75,6 +75,14 @@ export default {
     streamName: {
       type: String,
       default: null
+    },
+    isFE2: {
+      type: Boolean,
+      default: false
+    },
+    branchTooltipName: {
+      type: String,
+      default: ''
     }
   },
   data() {

ui/src/components/dialogs/CreateStreamDialog.vue

@@ -16,13 +16,14 @@
                   left
               >
                 mdi-plus-circle
-              </v-icon>Create New Stream
+              </v-icon>
+              {{ `Create New ${isFE2 ? 'Project': 'Stream'}` }}
             </v-btn>
           </template>
 
           <v-card>
             <v-card-title class="text-h5">
-              Create a New Stream
+              {{ `Create a New ${isFE2 ? 'Project' : 'Stream'}` }}
             </v-card-title>
             <v-container class="px-6" pb-0>
               <!--
@@ -55,7 +56,7 @@
                   hide-details
                   dense
                   flat
-                  placeholder="Stream Name (Optional)"
+                  :placeholder="`${isFE2 ? 'Project' : 'Stream'} Name (Optional)`"
               />
               <v-text-field
                   v-model="description"
@@ -67,7 +68,7 @@
               />
               <v-switch
                   v-model="privateStream"
-                  :label="'Private Stream'"
+                  :label="`Private ${isFE2 ? 'Project' : 'Stream'}`"
               ></v-switch>
             </v-container>
 
@@ -169,6 +170,10 @@ export default {
     serverUrl: {
       type: String,
       default: null
+    },
+    isFE2: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -200,7 +205,7 @@ export default {
     },
     async getStream(){
       try {
-        const streamWrapper = new StreamWrapper(this.createStreamByIdText, this.accountId, this.serverUrl)
+        const streamWrapper = new StreamWrapper(this.createStreamByIdText, this.accountId, this.serverUrl, this.isFE2)
         let res = await this.$apollo.query({
           query: gql`
             query Stream($id: String!){

ui/src/components/dialogs/SettingsDialog.vue

@@ -16,14 +16,25 @@
         Settings
       </v-card-title>
       <v-container class="px-6" pb-0>
-        <!-- Switch Theme -->
+
+        <!-- User preferences -->
         <div class="sm1 mt-3">User Preferences</div>
         <v-divider class="mb-2"/>
+
+        <!-- Switch Theme -->
         <v-btn icon small class="mx-1" @click="switchTheme">
           <v-icon>mdi-theme-light-dark</v-icon>
         </v-btn>
         <span>Color Mode</span>
 
+        <!-- FE2 -->
+        <v-switch
+            :input-value="fe2"
+            class="pt-3 mt-n2 mb-n7"
+            :label="'FE2'"
+            @change="fe2Handler"
+        />
+
         <!-- Register objects as Speckle Entity on send/receive -->
         <v-switch
             :input-value="registerSpeckleEntity"
@@ -133,6 +144,7 @@ export default {
       includeComponentAttributes: this.preferences.model.include_component_entity_attributes,
       mergeCoplanarFaces: this.preferences.model.merge_coplanar_faces,
       diffing: this.preferences.user.diffing,
+      fe2: this.preferences.user.fe2,
       registerSpeckleEntity: this.preferences.user.register_speckle_entity
     }
   },
@@ -147,6 +159,7 @@ export default {
         this.includeComponentAttributes = newValue.model.include_component_entity_attributes
         this.mergeCoplanarFaces = newValue.model.merge_coplanar_faces
         this.diffing = newValue.user.diffing
+        this.fe2 = newValue.user.fe2
         this.registerSpeckleEntity = newValue.user.register_speckle_entity
       },
       deep: true,
@@ -161,6 +174,15 @@ export default {
     }
   },
   methods: {
+    fe2Handler(newValue){
+      this.fe2 = !!newValue
+      sketchup.exec({
+        name: "user_preferences_updated",
+        data: {preference_hash: "configSketchup", preference: "fe2", value: this.fe2}
+      })
+      this.$mixpanel.track('Connector Action', { name: 'Toggle FE2' })
+      sketchup.exec({name: "collect_preferences", data: {}})
+    },
     diffingHandler(newValue){
       this.diffing = !!newValue
       sketchup.exec({

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/utils/streamWrapper.js

@@ -1,7 +1,11 @@
 require('url')
 
 export class StreamWrapper {
-    constructor(streamIdOrUrl, accountId, serverUrl) {
+    constructor(streamIdOrUrl, accountId, serverUrl, isFE2) {
+        this.isFE2 = isFE2
+        this.streamsKey = this.isFE2 ? 'projects/': 'streams/'
+        this.branchesKey = this.isFE2 ? 'models/': 'branches/'
+        this.commitsKey = this.isFE2 ? 'versions/': 'commits/'
         this.originalOutput = streamIdOrUrl
         try {
             this.streamWrapperFromUrl(streamIdOrUrl)
@@ -18,7 +22,7 @@ export class StreamWrapper {
         this.segments = this.url.pathname.split('/').map((segment) => segment + '/')
         this.serverUrl = this.url.origin
 
-        if (this.segments.length >= 4 && this.segments[3]?.toLowerCase() === "branches/"){
+        if (this.segments.length >= 4 && this.segments[3]?.toLowerCase() === this.branchesKey){
             this.streamId = this.segments[2].replace("/", "")
             if (this.segments.length > 5)
             {
@@ -32,7 +36,7 @@ export class StreamWrapper {
         } else {
             switch (this.segments.length){
                 case 3: // ie http://speckle.server/streams/8fecc9aa6d
-                    if (this.segments[1].toLowerCase() === "streams/")
+                    if (this.segments[1].toLowerCase() === this.streamsKey)
                         this.streamId = this.segments[2].replace("/", "");
                     else
                         throw new Error(`Cannot parse ${this.originalOutput} into a stream wrapper class`);
@@ -48,7 +52,7 @@ export class StreamWrapper {
                     break;
                 case 5: // ie http://speckle.server/streams/8fecc9aa6d/commits/76a23d7179
                     switch (this.segments[3].toLowerCase()){
-                        case "commits/":
+                        case this.commitsKey:
                             this.streamId = this.segments[2].replace("/", "");
                             this.commitId = this.segments[4].replace("/", "");
                             break;
@@ -57,7 +61,7 @@ export class StreamWrapper {
                             this.branchName = this.segments[3].replace("/", "");
                             this.commitId = this.segments[4].replace("/", "");
                             break;
-                        case "branches/":
+                        case this.branchesKey:
                             this.streamId = this.segments[2].replace("/", "");
                             this.branchName = this.segments[4].replace("/", "");
                             break;

ui/src/views/Streams.vue

@@ -27,7 +27,7 @@
           elevation="0"
           @click="showMore"
         >
-          More Streams
+          {{ `More ${streamsText}` }}
         </v-btn>
       </div>
     </div>
@@ -64,7 +64,8 @@ export default {
   data() {
     return {
       showMoreEnabled: true,
-      savedStreams: []
+      savedStreams: [],
+      streamsText: ''
     }
   },
   computed: {
@@ -80,6 +81,14 @@ export default {
     }
   },
   mounted() {
+    bus.$on('update-preferences', async (preferences) => {
+      const pref = JSON.parse(preferences)
+      this.streamsText = pref.user.fe2 ? 'Projects' : 'Streams'
+    })
+
+    // Collect preferences to render UI according to it
+    sketchup.exec({name: "collect_preferences", data: {}})
+
     bus.$on("deactivate-diffing-except", (exceptedStreamId) => {
       this.savedStreams.forEach((streamId) => {
         if (streamId !== exceptedStreamId){