Merge branch 'master' into update-v0.94

adobe · Aug 17, 2018 · 304b6cb · 304b6cb
2 parents 344d522 + 0644c75
commit 304b6cb
Show file tree

Hide file tree

Showing 8 changed files with 623 additions and 243 deletions.
diff --git a/STABILIZING.md b/STABILIZING.md
diff --git a/docs/reference/assets/video.schema.json b/docs/reference/assets/video.schema.json
@@ -65,7 +65,7 @@
     "meta:status": "experimental",
     "examples": [
         {
-            "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
+            "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
             "xmp:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
@@ -79,11 +79,11 @@
             "tiff:imageLength": 2160,
             "tiff:imageWidth": 3840,
             "xdm:aspectRatio": 1.77777777778,
-            "xdm:extent": 11700000,
-            "xdm:videoFrameRate": "NTSC"
+            "xdm:extent": 10920000,
+            "xdm:videoFrameRate": "f48s1"
         },
         {
-            "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
+            "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
             "xmp:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
@@ -97,8 +97,8 @@
             "tiff:imageLength": 2160,
             "tiff:imageWidth": 3840,
             "xdm:aspectRatio": 1.77777777778,
-            "xdm:extent": 10920000,
-            "xdm:videoFrameRate": "f48s1"
+            "xdm:extent": 11700000,
+            "xdm:videoFrameRate": "NTSC"
         }
     ]
 }
diff --git a/docs/reference/assets/video.schema.md b/docs/reference/assets/video.schema.md
@@ -21,7 +21,7 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
 
 ```json
 {
-  "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
+  "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
   "xmp:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
@@ -35,14 +35,14 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
   "tiff:imageLength": 2160,
   "tiff:imageWidth": 3840,
   "xdm:aspectRatio": 1.77777777778,
-  "xdm:extent": 11700000,
-  "xdm:videoFrameRate": "NTSC"
+  "xdm:extent": 10920000,
+  "xdm:videoFrameRate": "f48s1"
 }
 ```
 
 ```json
 {
-  "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
+  "repo:id": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
   "xmp:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
@@ -56,8 +56,8 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
   "tiff:imageLength": 2160,
   "tiff:imageWidth": 3840,
   "xdm:aspectRatio": 1.77777777778,
-  "xdm:extent": 10920000,
-  "xdm:videoFrameRate": "f48s1"
+  "xdm:extent": 11700000,
+  "xdm:videoFrameRate": "NTSC"
 }
 ```
 

diff --git a/docs/reference/common/geo.schema.json b/docs/reference/common/geo.schema.json
@@ -67,13 +67,6 @@
     ],
     "meta:status": "experimental",
     "examples": [
-        {
-            "@id": "https://data.adobe.io/entities/geo/potsdam",
-            "xdm:countryCode": "DE",
-            "xdm:stateProvince": "DE-BB",
-            "xdm:city": "Potsdam",
-            "xdm:postalCode": "14482"
-        },
         {
             "@id": "https://data.adobe.io/entities/geo/tokyo",
             "xdm:countryCode": "JP",
@@ -82,6 +75,13 @@
             "xdm:postalCode": "141-0032",
             "schema:latitude": 35.6185,
             "schema:longitude": 139.73237
+        },
+        {
+            "@id": "https://data.adobe.io/entities/geo/potsdam",
+            "xdm:countryCode": "DE",
+            "xdm:stateProvince": "DE-BB",
+            "xdm:city": "Potsdam",
+            "xdm:postalCode": "14482"
         }
     ]
 }
diff --git a/docs/reference/common/geo.schema.md b/docs/reference/common/geo.schema.md
@@ -18,16 +18,6 @@ The geographic related data where an event was observed.
 
 ## Geo Examples
 
-```json
-{
-  "@id": "https://data.adobe.io/entities/geo/potsdam",
-  "xdm:countryCode": "DE",
-  "xdm:stateProvince": "DE-BB",
-  "xdm:city": "Potsdam",
-  "xdm:postalCode": "14482"
-}
-```
-
 ```json
 {
   "@id": "https://data.adobe.io/entities/geo/tokyo",
@@ -40,6 +30,16 @@ The geographic related data where an event was observed.
 }
 ```
 
+```json
+{
+  "@id": "https://data.adobe.io/entities/geo/potsdam",
+  "xdm:countryCode": "DE",
+  "xdm:stateProvince": "DE-BB",
+  "xdm:city": "Potsdam",
+  "xdm:postalCode": "14482"
+}
+```
+
 
 # Geo Properties
 

diff --git a/docs/reference/context/person-name.schema.json b/docs/reference/context/person-name.schema.json
@@ -52,6 +52,11 @@
     ],
     "meta:status": "experimental",
     "examples": [
+        {
+            "xdm:firstName": "张",
+            "xdm:lastName": "三",
+            "xdm:fullName": "张三"
+        },
         {
             "xdm:firstName": "John",
             "xdm:middleName": "S",

diff --git a/docs/reference/context/segmentmembershipitem.schema.json b/docs/reference/context/segmentmembershipitem.schema.json
@@ -0,0 +1,57 @@
+{
+    "meta:license": [
+        "Copyright 2018 Adobe Systems Incorporated. All rights reserved.",
+        "This work is licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0) license",
+        "you may not use this file except in compliance with the License. You may obtain a copy",
+        "of the License at https://creativecommons.org/licenses/by/4.0/"
+    ],
+    "$id": "https://ns.adobe.com/xdm/context/segmentmembershipitem",
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "title": "Segment Membership Item",
+    "type": "object",
+    "description": "List item that contains details of segment membership combined the identities to which the membership applies",
+    "definitions": {
+        "membershipIdentities": {
+            "properties": {
+                "xdm:identities": {
+                    "title": "All User Identities",
+                    "type": "array",
+                    "items": {
+                        "$ref": "https://ns.adobe.com/xdm/context/identity"
+                    },
+                    "minItems": 1,
+                    "description": "Array of Identities. Condensed, normalized encapsulation of all end user identifiers."
+                }
+            }
+        }
+    },
+    "allOf": [
+        {
+            "$ref": "https://ns.adobe.com/xdm/context/segmentmembership"
+        },
+        {
+            "$ref": "#/definitions/membershipIdentities"
+        }
+    ],
+    "meta:status": "experimental",
+    "examples": [
+        {
+            "xdm:segmentID": {
+                "@id": "https://data.adobe.io/entities/identity/92312748749128",
+                "xdm:namespace": {
+                    "xdm:code": "AAM"
+                }
+            },
+            "xdm:profileStitchID": {
+                "@id": "https://data.adobe.io/entities/profileStitchIdentity/1",
+                "xdm:namespace": {
+                    "xdm:code": "AAM"
+                },
+                "xdm:lastQualificationTime": "2017-09-26T15:52:25+00:00",
+                "xdm:version": "1.0",
+                "xdm:validUntil": "2017-12-26T15:52:25+00:00",
+                "xdm:status": "realized"
+            }
+        }
+    ]
+}