feat: make SCContactPoint extend SCThing

Refactor SCPerson and SCOrganization

src/meta.ts

@@ -18,6 +18,7 @@ import {SCArticle, SCArticleMeta, SCArticleWithoutReferences} from './things/art
 import {SCBook, SCBookMeta, SCBookWithoutReferences} from './things/book';
 import {SCBuilding, SCBuildingMeta, SCBuildingWithoutReferences} from './things/building';
 import {SCCatalog, SCCatalogMeta, SCCatalogWithoutReferences} from './things/catalog';
+import {SCContactPoint, SCContactPointMeta, SCContactPointWithoutReferences} from './things/contact-point';
 import {SCCourseOfStudies, SCCourseOfStudiesMeta, SCCourseOfStudiesWithoutReferences} from './things/course-of-studies';
 import {SCDateSeries, SCDateSeriesMeta, SCDateSeriesWithoutReferences} from './things/date-series';
 import {SCDiff, SCDiffMeta, SCDiffWithoutReferences} from './things/diff';
@@ -49,6 +50,7 @@ export const SCClasses: { [K in SCThingType]: object } = {
   'book': SCBookMeta,
   'building': SCBuildingMeta,
   'catalog': SCCatalogMeta,
+  'contact point': SCContactPointMeta,
   'course of studies': SCCourseOfStudiesMeta,
   'date series': SCDateSeriesMeta,
   'diff': SCDiffMeta,
@@ -76,6 +78,7 @@ export type SCThingsWithoutDiff =
   | SCBook
   | SCBuilding
   | SCCatalog
+  | SCContactPoint
   | SCCourseOfStudies
   | SCDateSeries
   | SCDish
@@ -116,26 +119,27 @@ export type SCAssociatedThingWithoutReferences<THING extends SCThings> =
       THING extends SCBook ? SCBookWithoutReferences :
         THING extends SCBuilding ? SCBuildingWithoutReferences :
           THING extends SCCatalog ? SCCatalogWithoutReferences :
-            THING extends SCCourseOfStudies ? SCCourseOfStudiesWithoutReferences :
-              THING extends SCDateSeries ? SCDateSeriesWithoutReferences :
-                THING extends SCDiff ? SCDiffWithoutReferences :
-                  THING extends SCDish ? SCDishWithoutReferences :
-                    THING extends SCFavorite ? SCFavoriteWithoutReferences :
-                      THING extends SCFloor ? SCFloorWithoutReferences :
-                        THING extends SCMessage ? SCMessageWithoutReferences :
-                          THING extends SCOrganization ? SCOrganizationWithoutReferences :
-                            THING extends SCPerson ? SCPersonWithoutReferences :
-                              THING extends SCPointOfInterest ? SCPointOfInterestWithoutReferences :
-                                THING extends SCRoom ? SCRoomWithoutReferences :
-                                  THING extends SCSemester ? SCSemesterWithoutReferences :
-                                    THING extends SCSetting ? SCSettingWithoutReferences :
-                                      THING extends SCSportCourse ? SCSportCourseWithoutReferences :
-                                        THING extends SCStudyModule ? SCStudyModuleWithoutReferences :
-                                          THING extends SCTicket ? SCTicketWithoutReferences :
-                                            THING extends SCToDo ? SCToDoWithoutReferences :
-                                              THING extends SCTour ? SCTourWithoutReferences :
-                                                THING extends SCVideo ? SCVideoWithoutReferences :
-                                                  never;
+            THING extends SCContactPoint ? SCContactPointWithoutReferences :
+              THING extends SCCourseOfStudies ? SCCourseOfStudiesWithoutReferences :
+                THING extends SCDateSeries ? SCDateSeriesWithoutReferences :
+                  THING extends SCDiff ? SCDiffWithoutReferences :
+                    THING extends SCDish ? SCDishWithoutReferences :
+                      THING extends SCFavorite ? SCFavoriteWithoutReferences :
+                        THING extends SCFloor ? SCFloorWithoutReferences :
+                          THING extends SCMessage ? SCMessageWithoutReferences :
+                            THING extends SCOrganization ? SCOrganizationWithoutReferences :
+                              THING extends SCPerson ? SCPersonWithoutReferences :
+                                THING extends SCPointOfInterest ? SCPointOfInterestWithoutReferences :
+                                  THING extends SCRoom ? SCRoomWithoutReferences :
+                                    THING extends SCSemester ? SCSemesterWithoutReferences :
+                                      THING extends SCSetting ? SCSettingWithoutReferences :
+                                        THING extends SCSportCourse ? SCSportCourseWithoutReferences :
+                                          THING extends SCStudyModule ? SCStudyModuleWithoutReferences :
+                                            THING extends SCTicket ? SCTicketWithoutReferences :
+                                              THING extends SCToDo ? SCToDoWithoutReferences :
+                                                THING extends SCTour ? SCTourWithoutReferences :
+                                                  THING extends SCVideo ? SCVideoWithoutReferences :
+                                                    never;
 
 /**
  * Thing for a thing without references
@@ -146,23 +150,24 @@ export type SCAssociatedThing<THING extends SCThings> =
       THING extends SCBookWithoutReferences ? SCBook :
         THING extends SCBuildingWithoutReferences ? SCBuilding :
           THING extends SCCatalogWithoutReferences ? SCCatalog :
-            THING extends SCCourseOfStudiesWithoutReferences ? SCCourseOfStudies :
-              THING extends SCDateSeriesWithoutReferences ? SCDateSeries :
-                THING extends SCDiffWithoutReferences ? SCDiff :
-                  THING extends SCDishWithoutReferences ? SCDish :
-                    THING extends SCFavoriteWithoutReferences ? SCFavorite :
-                      THING extends SCFloorWithoutReferences ? SCFloor :
-                        THING extends SCMessageWithoutReferences ? SCMessage :
-                          THING extends SCOrganizationWithoutReferences ? SCOrganization :
-                            THING extends SCPersonWithoutReferences ? SCPerson :
-                              THING extends SCPointOfInterestWithoutReferences ? SCPointOfInterest :
-                                THING extends SCRoomWithoutReferences ? SCRoom :
-                                  THING extends SCSemesterWithoutReferences ? SCSemester :
-                                    THING extends SCSettingWithoutReferences ? SCSetting :
-                                      THING extends SCSportCourseWithoutReferences ? SCSportCourse :
-                                        THING extends SCStudyModuleWithoutReferences ? SCStudyModule :
-                                          THING extends SCTicketWithoutReferences ? SCTicket :
-                                            THING extends SCToDoWithoutReferences ? SCToDo :
-                                              THING extends SCTourWithoutReferences ? SCTour :
-                                                THING extends SCVideoWithoutReferences ? SCVideo :
-                                                  never;
+            THING extends SCContactPointWithoutReferences ? SCContactPoint :
+              THING extends SCCourseOfStudiesWithoutReferences ? SCCourseOfStudies :
+                THING extends SCDateSeriesWithoutReferences ? SCDateSeries :
+                  THING extends SCDiffWithoutReferences ? SCDiff :
+                    THING extends SCDishWithoutReferences ? SCDish :
+                      THING extends SCFavoriteWithoutReferences ? SCFavorite :
+                        THING extends SCFloorWithoutReferences ? SCFloor :
+                          THING extends SCMessageWithoutReferences ? SCMessage :
+                            THING extends SCOrganizationWithoutReferences ? SCOrganization :
+                              THING extends SCPersonWithoutReferences ? SCPerson :
+                                THING extends SCPointOfInterestWithoutReferences ? SCPointOfInterest :
+                                  THING extends SCRoomWithoutReferences ? SCRoom :
+                                    THING extends SCSemesterWithoutReferences ? SCSemester :
+                                      THING extends SCSettingWithoutReferences ? SCSetting :
+                                        THING extends SCSportCourseWithoutReferences ? SCSportCourse :
+                                          THING extends SCStudyModuleWithoutReferences ? SCStudyModule :
+                                            THING extends SCTicketWithoutReferences ? SCTicket :
+                                              THING extends SCToDoWithoutReferences ? SCToDo :
+                                                THING extends SCTourWithoutReferences ? SCTour :
+                                                  THING extends SCVideoWithoutReferences ? SCVideo :
+                                                    never;

src/things/abstract/thing.ts

@@ -27,6 +27,7 @@ export enum SCThingType {
   Book = 'book',
   Building = 'building',
   Catalog = 'catalog',
+  ContactPoint = 'contact point',
   CourseOfStudies = 'course of studies',
   DateSeries = 'date series',
   Diff = 'diff',

src/things/contact-point.ts

@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2019 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {SCMetaTranslations} from '../general/i18n';
+import {
+  SCThing,
+  SCThingMeta,
+  SCThingType,
+  SCThingWithoutReferences,
+  } from './abstract/thing';
+import {SCRoomWithoutReferences} from './room';
+
+/**
+ * A contact point without references
+ */
+export interface SCContactPointWithoutReferences
+  extends SCThingWithoutReferences  {
+  /**
+   * E-mail at the work location
+   *
+   * @keyword
+   */
+  email?: string;
+
+  /**
+   * Fax number at the work location
+   *
+   * @keyword
+   */
+  faxNumber?: string;
+
+  /**
+   * Office hours for contacting someone at the work location
+   *
+   * @see http://wiki.openstreetmap.org/wiki/Key:opening_hours/specification
+   * @keyword
+   */
+  officeHours?: string;
+
+  /**
+   * Contact number at the work location
+   *
+   * @keyword
+   */
+  telephone?: string;
+
+  /**
+   * Type of a contact point
+   */
+  type: SCThingType.ContactPoint;
+
+  /**
+   * URL at the work location
+   *
+   * @keyword
+   */
+  url?: string;
+}
+
+/**
+ * A contact point
+ *
+ * @see http://schema.org/ContactPoint
+ * 
+ * @validatable
+ * @indexable
+ */
+export interface SCContactPoint
+  extends SCContactPointWithoutReferences, SCThing  {
+  /**
+   * Exact place where work is performed
+   */
+  areaServed?: SCRoomWithoutReferences;
+
+  /**
+   * Type of a contact point
+   */
+  type: SCThingType.ContactPoint;
+}
+
+/**
+ * Meta information about a contact point
+ */
+export class SCContactPointMeta
+  extends SCThingMeta
+  implements SCMetaTranslations<SCContactPoint> {
+  /**
+   * Translations of fields
+   */
+  fieldTranslations = {
+    de: {
+      ...SCThingMeta.getInstance<SCThingMeta>().fieldTranslations.de,
+      areaServed: 'Arbeitsraum',
+      email: 'E-Mail-Addresse',
+      faxNumber: 'Faxnummer',
+      officeHours: 'Sprechzeiten',
+      telephone: 'Telefonnummer',
+      url: 'Link',
+    },
+    en: {
+      ...SCThingMeta.getInstance<SCThingMeta>().fieldTranslations.en,
+      areaServed: 'location',
+      email: 'email address',
+      faxNumber: 'fax number',
+      officeHours: 'office hours',
+      telephone: 'telephone number',
+      url: 'link',
+    },
+  };
+
+  /**
+   * Translations of values of fields
+   */
+  fieldValueTranslations = {
+    de: {
+      ...SCThingMeta.getInstance<SCThingMeta>().fieldValueTranslations.de,
+      type: 'Kontaktinformation',
+    },
+    en: {
+      ...SCThingMeta.getInstance<SCThingMeta>().fieldValueTranslations.en,
+      type: SCThingType.ContactPoint,
+    },
+  };
+}

src/things/organization.ts

@@ -15,6 +15,7 @@
 import {SCMetaTranslations} from '../general/i18n';
 import {SCThingMeta, SCThingType, SCThingWithoutReferences} from './abstract/thing';
 import {SCThingInPlace, SCThingInPlaceMeta} from './abstract/thing-in-place';
+import {SCContactPointWithoutReferences} from './contact-point';
 
 /**
  * An organization without references
@@ -35,6 +36,11 @@ export interface SCOrganizationWithoutReferences
  */
 export interface SCOrganization
   extends SCOrganizationWithoutReferences, SCThingInPlace {
+  /**
+   * A list of contact points concerning the organization
+   */
+  contactPoints?: SCContactPointWithoutReferences[];
+
   /**
    * Type of an organization
    */
@@ -52,9 +58,11 @@ export class SCOrganizationMeta
   fieldTranslations = {
     de: {
       ...SCThingInPlaceMeta.getInstance<SCThingInPlaceMeta>().fieldTranslations.de,
+      contactPoints: 'Kontaktinformationen',
     },
     en: {
       ...SCThingInPlaceMeta.getInstance<SCThingInPlaceMeta>().fieldTranslations.en,
+      contactPoints: 'contact details',
     },
   };
 

src/things/person.ts

@@ -16,6 +16,7 @@ import {SCMetaTranslations, SCNationality} from '../general/i18n';
 import {SCISO8601Date} from '../general/time';
 import {SCThing, SCThingMeta, SCThingType, SCThingWithoutReferences} from './abstract/thing';
 import {SCBuildingWithoutReferences} from './building';
+import {SCContactPointWithoutReferences} from './contact-point';
 import {SCOrganizationWithoutReferences} from './organization';
 import {SCPointOfInterestWithoutReferences} from './point-of-interest';
 import {SCRoomWithoutReferences} from './room';
@@ -159,7 +160,7 @@ export interface SCPerson
   /**
    * Locations where the person performs her/his work
    */
-  workLocations?: SCContactPoint[];
+  workLocations?: SCContactPointWithoutReferences[];
 }
 
 /**
@@ -188,13 +189,14 @@ export class SCPersonMeta
       jobTitles: 'Berufsbezeichnungen',
       nationality: 'Staatsangehörigkeit',
       telephone: 'Telefonnummer',
-      workLocations: 'Arbeitsorte',
+      workLocations: 'Arbeitsstandorte',
     },
     en: {
       ...SCThingMeta.getInstance<SCThingMeta>().fieldTranslations.en,
       additionalName: 'additional name',
       affiliations: 'affiliations',
       birthDate: 'birth date',
+      contactDetails: 'contact details',
       email: 'email',
       familyName: 'family name',
       faxNumber: 'fax',
@@ -231,53 +233,6 @@ export class SCPersonMeta
   };
 }
 
-/**
- * A contact point
- *
- * @see http://schema.org/ContactPoint
- */
-export interface SCContactPoint {
-  /**
-   * Exact place where work is performed
-   */
-  areaServed?: SCRoomWithoutReferences;
-
-  /**
-   * E-mail at the work location
-   *
-   * @keyword
-   */
-  email?: string;
-
-  /**
-   * Fax number at the work location
-   *
-   * @keyword
-   */
-  faxNumber?: string;
-
-  /**
-   * Times available for contacting at the work location
-   *
-   * @keyword
-   */
-  hoursAvailable?: string;
-
-  /**
-   * Contact number at the work location
-   *
-   * @keyword
-   */
-  telephone?: string;
-
-  /**
-   * URL at the work location
-   *
-   * @keyword
-   */
-  url?: string;
-}
-
 /**
  * Gender of a person
  */