Skip to content

Commit ef7cf4e

Browse files
committed
Merge branch 'prezi-4-scale' of https://github.com/IIIF/api into prezi-4-scale
2 parents bfbe5a0 + 7cb8302 commit ef7cf4e

2 files changed

Lines changed: 13 additions & 15 deletions

File tree

source/presentation/4.0/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ In many cases, the dimensions of a Canvas, or the pixel density of a photograph,
14821482

14831483
The `spatialScale` property of a Canvas or Scene provides a corresponding real-world scale for a unit of the Canvas or Scene coordinate system, allowing clients to provide scale information to users, for example by an on-screen virtual ruler. In a 2-up viewer, a client could scale two views to convey the true relative sizes of two objects.
14841484

1485-
The value of `spatialScale` is a `UnitValue` (ref) that always has the value "m", i.e., metres. If source size metadata is machine readable (or parse-able) in other measurement systems (e.g., feet and inches) then it should be converted to metres for use in `spatialScale`. Publishers may wish to present the original given measure (e.g., from catalogue metadata) in a `metadata` field for context.
1485+
The value of `spatialScale` is a `UnitValue` (ref) that has as a value a length unit. This specification defines only one length unit, "m", i.e., metres, though others may be defined externally as an [extension][prezi30-ldce]. If source size metadata is machine readable (or parse-able) in other measurement systems (e.g., feet and inches) then it should be converted to metres for use in `spatialScale`. Publishers may wish to present the original given measure (e.g., from catalogue metadata) in a `metadata` field for context.
14861486

14871487
The Presentation API also offers a corresponding `temporalScale` property for the `duration` dimension of a Container, when 1 second in the Container does not correspond to 1 second of real time. This is useful for speeded-up or slowed-down audio or video.
14881488

source/presentation/4.0/model.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,19 +1852,18 @@ The value _MUST_ be an array of JSON objects. Each object _MUST_ be a service re
18521852
### spatialScale
18531853
{: #spatialScale}
18541854

1855-
A single UnitValue that defines a real-world scale factor for the coordinate units of a Canvas or Scene. For a Canvas, this defines the physical distance between adjacent units horizontally and vertically. A Canvas with a `width` of 5000 and a `spatialScale` with `value` 0.00008 represents a physical space 0.4 metres wide. For a Scene, this defines the physical distance corresponding to the XYZ coordinate units, or in other words, the physical distance length of a unit vector in the 3D coordinate space. The value of `unit` _MUST_ always be `m`, i.e., metres.
1855+
A single UnitValue that defines a real-world scale factor for the coordinate units of a Canvas or Scene. For a Canvas, this defines the physical distance between adjacent units horizontally and vertically. A Canvas with a `width` of 5000 and a `spatialScale` with `value` 0.00008 represents a physical space 0.4 metres wide. For a Scene, this defines the physical distance corresponding to the XYZ coordinate units, or in other words, the physical distance length of a unit vector in the 3D coordinate space. The value of `unit` _MUST_ be a length unit. In this specification, the only length unit defined is `m`, i.e., metres. Unless other values are defined externally as an [extension][prezi30-ldce], the value of `unit` _SHOULD_ always be `m`.
18561856

18571857

18581858
{% include api/code_header.html %}
18591859
``` json-doc
18601860
{
18611861
"type": "Scene",
1862-
1863-
"spatialScale": {
1864-
"type": "UnitValue",
1865-
"value": 22.0,
1866-
"unit": "m"
1867-
}
1862+
"spatialScale": {
1863+
"type": "UnitValue",
1864+
"value": 22.0,
1865+
"unit": "m"
1866+
}
18681867
}
18691868
```
18701869

@@ -1990,19 +1989,18 @@ The value _MUST_ be a JSON object, which _MUST_ have the `id` and `type` propert
19901989
### temporalScale
19911990
{: #temporalScale}
19921991

1993-
A single UnitValue that defines a multiplier or scale factor for the `duration` property of a Container, indicating that one second in "Container time" represents some other real world duration. A Canvas with a `duration` of 450 seconds and a `temporalScale` with `value` 1000 represents a real-world duration of 450,000 seconds (5.2 days), for example a time-lapse video of a growing plant. The value of `unit` _MUST_ always be `s`, i.e., seconds.
1992+
A single UnitValue that defines a multiplier or scale factor for the `duration` property of a Container, indicating that one second in "Container time" represents some other real world duration. A Canvas with a `duration` of 450 seconds and a `temporalScale` with `value` 1000 represents a real-world duration of 450,000 seconds (5.2 days), for example a time-lapse video of a growing plant. The value of `unit` _MUST_ be a time unit. In this specification, the only time unit defined is `s`, i.e., seconds. Unless other values are defined externally as an [extension][prezi30-ldce], the value of `unit` _SHOULD_ always be `s`.
19941993

19951994

19961995
{% include api/code_header.html %}
19971996
``` json-doc
19981997
{
19991998
"type": "Canvas",
2000-
2001-
"temporalScale": {
2002-
"type": "UnitValue",
2003-
"value": 1000,
2004-
"unit": "s"
2005-
}
1999+
"temporalScale": {
2000+
"type": "UnitValue",
2001+
"value": 1000,
2002+
"unit": "s"
2003+
}
20062004
}
20072005
```
20082006

0 commit comments

Comments
 (0)