refactor error=deleted to prop

src/components/FeaturePanel/FeaturePanel.tsx

@@ -29,9 +29,8 @@ export const FeaturePanel = () => {
   const [showAround, toggleShowAround] = useToggleState(false);
   const [showTags, toggleShowTags] = useToggleState(false);
 
-  const { point, tags, osmMeta, skeleton, error } = feature;
-  const deleted = error === 'deleted';
-  const editEnabled = !skeleton && (!error || deleted);
+  const { point, tags, osmMeta, skeleton, deleted } = feature;
+  const editEnabled = !skeleton;
   const showTagsTable = deleted || showTags;
 
   const osmappLink = getFullOsmappLink(feature);

src/components/FeaturePanel/OsmError.tsx

@@ -9,7 +9,7 @@ export const OsmError = () => {
   const { feature } = useFeatureContext();
   const code = feature.error;
 
-  if (code === 'deleted') {
+  if (feature.deleted) {
     return (
       <Box mb={3} clone>
         <Alert variant="outlined" severity="warning">

src/components/FeaturePanel/Properties/IdSchemeFields.tsx

@@ -79,15 +79,16 @@ const addUnits = (label, value: string | ReactNode) => {
   return `${value}${unit ? ` (${unit[1]})` : ''}`;
 };
 
-const getTooltip = (field: Field, key: string, value: string) =>
+const getTooltip = (field: Field, key: string) =>
   `field: ${field.fieldKey}${key === field.fieldKey ? '' : `, key: ${key}`}`;
 
 export const IdSchemeFields = () => {
   const { openWithTag } = useEditDialogContext();
   const [otherTagsShown, toggleOtherTagsShown] = useToggleState(false);
   const { feature } = useFeatureContext();
-  const deleted = feature.error === 'deleted';
-  const featuredTags = deleted ? [] : feature.schema?.featuredTags ?? [];
+  const featuredTags = feature.deleted
+    ? []
+    : feature.schema?.featuredTags ?? [];
   const { schema } = feature;
 
   if (!schema) return null;
@@ -119,7 +120,7 @@ export const IdSchemeFields = () => {
           {schema.matchedFields.map(
             ({ key, value, label, field, fieldTranslation, tagsForField }) => (
               <tr key={key}>
-                <th title={getTooltip(field, key, value)}>
+                <th title={getTooltip(field, key)}>
                   {removeUnits(label)}
                 </th>
                 <td>
@@ -167,7 +168,7 @@ export const IdSchemeFields = () => {
                     tagsForField,
                   }) => (
                     <tr key={key}>
-                      <th title={getTooltip(field, key, value)}>
+                      <th title={getTooltip(field, key)}>
                         {removeUnits(label)}
                       </th>
                       <td>

src/components/FeaturePanel/Properties/Properties.tsx

@@ -8,14 +8,15 @@ import { Subheading } from '../helpers/Subheading';
 
 export const Properties = ({ showTags }) => {
   const { feature } = useFeatureContext();
-  const deleted = feature.error === 'deleted';
 
   return (
     <>
       {!showTags && (
         <>
           <FeaturedTags
-            featuredTags={deleted ? [] : feature.schema?.featuredTags ?? []}
+            featuredTags={
+              feature.deleted ? [] : feature.schema?.featuredTags ?? []
+            }
           />
           <IdSchemeFields />
         </>

src/components/FeaturePanel/Properties/helpers.tsx

@@ -1,9 +1,9 @@
 import styled from 'styled-components';
 import Button from '@material-ui/core/Button';
-import { t } from '../../../services/intl';
 import ChevronRight from '@material-ui/icons/ChevronRight';
 import ExpandLessIcon from '@material-ui/icons/ExpandLess';
 import React from 'react';
+import { t } from '../../../services/intl';
 
 const StyledToggleButton = styled(Button)`
   svg {

src/helpers/TitleAndMetaTags.tsx

@@ -27,7 +27,7 @@ export const OpenGraphTags = ({
 
 const getTitle = (feature: Feature) => {
   const label = getLabel(feature);
-  return feature.error === 'deleted' ? getUtfStrikethrough(label) : label;
+  return feature.deleted ? getUtfStrikethrough(label) : label;
 };
 
 export const TitleAndMetaTags = () => {

src/services/osmApi.ts

@@ -93,7 +93,7 @@ const osmToFeature = (element): Feature => {
     tags,
     members,
     properties: getPoiClass(tags),
-    error: osmappDeletedMarker ? 'deleted' : undefined,
+    deleted: osmappDeletedMarker,
   };
 };
 

src/services/osmApiAuth.ts

@@ -167,20 +167,20 @@ const getItemOrLastHistoric = async (apiId: OsmApiId) => {
   }
 };
 
-const getDescription = (isDelete, feature) => {
-  const undelete = feature.error === 'deleted';
-  const action = undelete ? 'Undeleted' : isDelete ? 'Deleted' : 'Edited';
+const getDescription = (isCancelled, feature) => {
+  const undelete = feature.deleted;
+  const action = undelete ? 'Undeleted' : isCancelled ? 'Deleted' : 'Edited';
   const { subclass } = feature.properties;
   const name = feature.tags.name || subclass || getUrlOsmId(feature.osmMeta);
   return `${action} ${name}`;
 };
 
 const getChangesetComment = (
   comment: string,
-  isDelete: boolean,
+  isCancelled: boolean,
   feature: Feature,
 ) => {
-  const description = getDescription(isDelete, feature);
+  const description = getDescription(isCancelled, feature);
   return join(comment, ' • ', `${description} #osmapp`);
 };
 
@@ -208,10 +208,10 @@ export const editOsmFeature = async (
   feature: Feature,
   comment: string,
   newTags: FeatureTags,
-  isDelete: boolean,
+  isCancelled: boolean,
 ) => {
   const apiId = prod ? feature.osmMeta : TEST_OSM_ID;
-  const changesetComment = getChangesetComment(comment, isDelete, feature);
+  const changesetComment = getChangesetComment(comment, isCancelled, feature);
   const changesetXml = getChangesetXml({ changesetComment, feature });
 
   const changesetId = await putChangeset(changesetXml);
@@ -224,10 +224,10 @@ export const editOsmFeature = async (
     apiId,
     changesetId,
     newTags,
-    isDelete,
+    isCancelled,
   );
 
-  await putOrDeleteItem(isDelete, apiId, newItem);
+  await putOrDeleteItem(isCancelled, apiId, newItem);
   await putChangesetClose(changesetId);
 
   clearFeatureCache(feature.osmMeta);

src/services/tagging/idTaggingScheme.ts

@@ -26,7 +26,7 @@ const matchFieldsFromPreset = (
   preset: Preset,
   keysTodo: any,
   feature: Feature,
-) => {
+): any => {
   const computedAllFieldKeys = computeAllFieldKeys(preset);
   publishDbgObject('computedAllFieldKeys', computedAllFieldKeys);
 
@@ -38,11 +38,11 @@ const matchFieldsFromPreset = (
       const shouldWeIncludeThisField =
         keysTodo.has(key) || keysTodo.hasAny(keys);
       if (!shouldWeIncludeThisField) {
-        return {};
+        return undefined;
       }
       if (field.type === 'typeCombo') {
         keysTodo.remove(field.key); // ignores eg. railway=tram_stop on public_transport=stop_position
-        return {};
+        return undefined;
       }
 
       const value = feature.tags[key];
@@ -98,11 +98,11 @@ const matchRestToFields = (keysTodo: KeysTodo, feature: Feature) =>
     }
 
     if (!field) {
-      return false;
+      return undefined;
     }
     if (field.type === 'typeCombo') {
       keysTodo.remove(field.key); // ignores eg. railway=tram_stop on public_transport=stop_position
-      return false;
+      return undefined;
     }
 
     const value = feature.tags[key];

src/services/types.ts

@@ -74,7 +74,8 @@ export interface Feature {
   center: Position;
   roundedCenter?: LonLatRounded;
   ssrFeatureImage?: Image;
-  error?: 'deleted' | 'network' | 'unknown' | '404' | '500'; // etc.
+  error?: 'network' | 'unknown' | '404' | '500'; // etc.
+  deleted?: boolean;
   schema?: ReturnType<typeof getSchemaForFeature>;
 
   // skeleton