fixup featuredTags

zbycz · Oct 28, 2023 · 2f201bb · 2f201bb
1 parent 7794435
commit 2f201bb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/src/components/FeaturePanel/FeaturePanel.tsx b/src/components/FeaturePanel/FeaturePanel.tsx
@@ -31,7 +31,7 @@ export const FeaturePanel = () => {
 
   const { point, tags, osmMeta, skeleton, deleted } = feature;
   const editEnabled = !skeleton;
-  const showTagsTable = deleted || showTags || !feature.schema;
+  const showTagsTable = deleted || showTags || (!skeleton && !feature.schema);
 
   const osmappLink = getFullOsmappLink(feature);
 
@@ -48,34 +48,38 @@ export const FeaturePanel = () => {
             editEnabled={editEnabled && !point}
           />
 
-          <OsmError />
+          {!skeleton && (
+            <>
+              <OsmError />
 
-          <Properties
-            showTags={showTagsTable}
-            key={getUrlOsmId(osmMeta) + (deleted && 'del')}
-          />
+              <Properties
+                showTags={showTagsTable}
+                key={getUrlOsmId(osmMeta) + (deleted && 'del')}
+              />
 
-          {advanced && <Members />}
+              {advanced && <Members />}
 
-          <PublicTransport tags={tags} />
+              <PublicTransport tags={tags} />
 
-          {editEnabled && (
-            <>
-              <EditButton isAddPlace={point} isUndelete={deleted} />
+              {editEnabled && (
+                <>
+                  <EditButton isAddPlace={point} isUndelete={deleted} />
 
-              <EditDialog
-                feature={feature}
-                isAddPlace={point}
-                isUndelete={deleted}
-                key={
-                  getUrlOsmId(osmMeta) + (deleted && 'del') // we need to refresh inner state
-                }
-              />
+                  <EditDialog
+                    feature={feature}
+                    isAddPlace={point}
+                    isUndelete={deleted}
+                    key={
+                      getUrlOsmId(osmMeta) + (deleted && 'del') // we need to refresh inner state
+                    }
+                  />
+                </>
+              )}
+
+              {point && <ObjectsAround advanced={advanced} />}
             </>
           )}
 
-          {point && <ObjectsAround advanced={advanced} />}
-
           <PanelFooter>
             <FeatureDescription setAdvanced={setAdvanced} />
             <Coordinates />
@@ -87,7 +91,7 @@ export const FeaturePanel = () => {
                 type="checkbox"
                 onChange={toggleShowTags}
                 checked={showTagsTable}
-                disabled={point || deleted || !feature.schema}
+                disabled={point || deleted || (!skeleton && !feature.schema)}
               />{' '}
               {t('featurepanel.show_tags')}
             </label>{' '}

diff --git a/src/services/tagging/idTaggingScheme.ts b/src/services/tagging/idTaggingScheme.ts
@@ -206,7 +206,7 @@ export const getSchemaForFeature = (feature: Feature) => {
   keysTodo.resolveTags(preset.tags); // remove tags which are already covered by Preset keys
   keysTodo.remove('name'); // always rendered by FeaturePanel
 
-  const featuredTags = getFeaturedTags(feature);
+  const featuredTags = feature.deleted ? [] : getFeaturedTags(feature);
   keysTodo.resolveTags(featuredTags);
 
   const matchedFields = matchFieldsFromPreset(preset, keysTodo, feature);