Skip to content

Commit

Permalink
Merge pull request #6744 from AnalyticalGraphicsInc/tileset-url-to-uri
Browse files Browse the repository at this point in the history 
Tileset content.url to content.uri
  • Loading branch information
@lilleyse
lilleyse committed Jul 5, 2018
2 parents d281633 + a4e07e3 commit b387130
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ Change Log

### 1.48 - 2018-08-01

#### Deprecated :hourglass_flowing_sand:
* Support for 3D Tiles `content.url` is deprecated to reflect updates to the [3D Tiles spec](https://github.com/AnalyticalGraphicsInc/3d-tiles/pull/301). Use `content.uri instead`. Support for `content.url` will remain for backwards compatibility. [#6744](https://github.com/AnalyticalGraphicsInc/cesium/pull/6744)

#### Fixes :wrench:
* Fixed bug causing billboards and labels to appear the wrong size when switching scene modes [#6745](https://github.com/AnalyticalGraphicsInc/cesium/issues/6745)

Expand Down
15 changes: 10 additions & 5 deletions Source/Scene/Cesium3DTile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ define([
}

/**
* Specifies the type of refinment that is used when traversing this tile for rendering.
* Specifies the type of refinement that is used when traversing this tile for rendering.
*
* @type {Cesium3DTileRefine}
* @readonly
Expand Down Expand Up @@ -185,15 +185,20 @@ define([
baseResource = Resource.createIfNeeded(baseResource);

if (defined(contentHeader)) {
var contentHeaderUrl = contentHeader.url;
if (tileset._brokenUrlWorkaround && contentHeaderUrl.length > 0 && (contentHeaderUrl[0] === '/')) {
contentHeaderUrl = contentHeader.url = contentHeaderUrl.substring(1);
var contentHeaderUri = contentHeader.uri;
if (defined(contentHeader.url)) {
Cesium3DTile._deprecationWarning('contentUrl', 'This tileset JSON uses the "content.url" property which has been deprecated. Use "content.uri" instead.');
contentHeaderUri = contentHeader.url;
}

if (tileset._brokenUrlWorkaround && contentHeaderUri.length > 0 && (contentHeaderUri[0] === '/')) {
contentHeaderUri = contentHeader.uri = contentHeaderUri.substring(1);
}

hasEmptyContent = false;
contentState = Cesium3DTileContentState.UNLOADED;
contentResource = baseResource.getDerivedResource({
url : contentHeaderUrl
url : contentHeaderUri
});
serverKey = RequestScheduler.getServerKey(contentResource.getUrlComponent());
} else {
Expand Down
41 changes: 41 additions & 0 deletions Specs/Data/Cesium3DTiles/Tilesets/TilesetWithContentUri/tileset.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"asset": {
"version": "1.0"
},
"properties": {
"id": {
"minimum": 0,
"maximum": 9
},
"Longitude": {
"minimum": -1.3196972173766555,
"maximum": -1.3196718547473905
},
"Latitude": {
"minimum": 0.6988624606923348,
"maximum": 0.6988888301460953
},
"Height": {
"minimum": 6.2074098233133554,
"maximum": 12.83180232718587
}
},
"geometricError": 70,
"root": {
"refine": "ADD",
"boundingVolume": {
"region": [
-1.3197004795898053,
0.6988582109,
-1.3196595204101946,
0.6988897891,
0,
20
]
},
"geometricError": 0,
"content": {
"uri": "data:application/octet-stream;base64,YjNkbQEAAAAAJgAAFAAAAAAAAABwAgAAAAAAAHsiQkFUQ0hfTEVOR1RIIjoxMH0geyJpZCI6WzAsMSwyLDMsNCw1LDYsNyw4LDldLCJMb25naXR1ZGUiOlstMS4zMTk2OCwtMS4zMTk2ODMyNjE2Njk1MTg3LC0xLjMxOTY3MTg1NDc0NzM5MDUsLTEuMzE5Njg5NTUwNTYzNDY0NSwtMS4zMTk2NzI1MDM0MDUzOTU4LC0xLjMxOTY5MjkyNTA4NDMzNTcsLTEuMzE5Njc4MTA3Mzg2MjI2LC0xLjMxOTY5NzIxNzM3NjY1NTUsLTEuMzE5Njg4Njg4NzE5MTA2OCwtMS4zMTk2OTUyNzEyMjE2ODM0XSwiTGF0aXR1ZGUiOlswLjY5ODg3NCwwLjY5ODg2ODMzMjg2MzY5MjEsMC42OTg4Nzc3NjYzNjI1NTU4LDAuNjk4ODc4MTkxNjE4NjA1MywwLjY5ODg2MjQ2MDY5MjMzNDgsMC42OTg4ODA5Mzk0NDMwNTUyLDAuNjk4ODczODE4MDA5NzkzNSwwLjY5ODg4ODgzMDE0NjA5NTMsMC42OTg4NzE3MzAyMzI1OTc3LDAuNjk4ODczODE5NjgxMTQ5Nl0sIkhlaWdodCI6WzYuMjA3NDA5ODIzMzEzMzU1NCw5Ljg3Nzk5Mjc2OTcwMzI2OSw3LjYzNzE4OTA4ODM4OTI3NzUsOS44ODE0MDczMTg2MzY3NzUsMTAuMjMzMTM2NzIyODE4MDE3LDEwLjY5NDM3NTgzMTYzMzgwNiwxMi44MzE4MDIzMjcxODU4Nyw3LjQxNTg3Njk5MDE4NDE4OCw2LjUyMjI5MjAyOTExMjU3Nyw3LjQ1MzgxNjI5ODM5NTM5NV19ICAgICAgZ2xURgIAAABgIwAANAYAAEpTT057ImFjY2Vzc29ycyI6W3siYnVmZmVyVmlldyI6MCwiYnl0ZU9mZnNldCI6MCwiY29tcG9uZW50VHlwZSI6NTEyNiwiY291bnQiOjI0MCwidHlwZSI6IlZFQzMiLCJtaW4iOlstNzcuMTQzMjg3OTIzNDE5ODUsLTQyLjk2MzMxODA5NzQwNTEzNiwtNjcuNTIxMTQ3NTA0NDQ4ODldLCJtYXgiOls3Ny43NjI1NjY5NzgxMTE4Niw0Ni42MTcxMDA4NTE2MTAzLDcyLjMzNzE1MjA1NDk5OTAyXX0seyJidWZmZXJWaWV3IjoxLCJieXRlT2Zmc2V0IjowLCJjb21wb25lbnRUeXBlIjo1MTI2LCJjb3VudCI6MjQwLCJ0eXBlIjoiVkVDMyIsIm1pbiI6Wy0wLjk2ODYzNTYzNDM3Njg3OTMsLTAuNzQxNTU1NTY1MjIxMzQ0NiwtMC43NjU1NjcwOTEzODQ1NTldLCJtYXgiOlswLjk2ODYzNTYzNDM3Njg3OTMsMC43NDE1NTU1NjUyMjEzNDQ2LDAuNzY1NTY3MDkxMzg0NTU5XX0seyJidWZmZXJWaWV3IjoyLCJieXRlT2Zmc2V0IjowLCJjb21wb25lbnRUeXBlIjo1MTI2LCJjb3VudCI6MjQwLCJ0eXBlIjoiU0NBTEFSIiwibWluIjpbMF0sIm1heCI6WzldfSx7ImJ1ZmZlclZpZXciOjMsImJ5dGVPZmZzZXQiOjAsImNvbXBvbmVudFR5cGUiOjUxMjMsImNvdW50IjozNjAsInR5cGUiOiJTQ0FMQVIiLCJtaW4iOlswXSwibWF4IjpbMjM5XX1dLCJhc3NldCI6eyJnZW5lcmF0b3IiOiIzZC10aWxlcy1zYW1wbGVzLWdlbmVyYXRvciIsInZlcnNpb24iOiIyLjAifSwiYnVmZmVycyI6W3siYnl0ZUxlbmd0aCI6NzQ0MH1dLCJidWZmZXJWaWV3cyI6W3siYnVmZmVyIjowLCJieXRlTGVuZ3RoIjoyODgwLCJieXRlT2Zmc2V0IjowLCJ0YXJnZXQiOjM0OTYyLCJieXRlU3RyaWRlIjoxMn0seyJidWZmZXIiOjAsImJ5dGVMZW5ndGgiOjI4ODAsImJ5dGVPZmZzZXQiOjI4ODAsInRhcmdldCI6MzQ5NjIsImJ5dGVTdHJpZGUiOjEyfSx7ImJ1ZmZlciI6MCwiYnl0ZUxlbmd0aCI6OTYwLCJieXRlT2Zmc2V0Ijo1NzYwLCJ0YXJnZXQiOjM0OTYyLCJieXRlU3RyaWRlIjo0fSx7ImJ1ZmZlciI6MCwiYnl0ZUxlbmd0aCI6NzIwLCJieXRlT2Zmc2V0Ijo2NzIwLCJ0YXJnZXQiOjM0OTYzfV0sIm1hdGVyaWFscyI6W3sicGJyTWV0YWxsaWNSb3VnaG5lc3MiOnsiYmFzZUNvbG9yRmFjdG9yIjpbMSwx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kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+Pmt7kiOB+Hc/93J+Pmt7kiOB+Hc/93J+Pmt7kiOB+Hc/93J+Pmt7kiOB+He/93J+vmt7kqOB+He/93J+vmt7kqOB+He/93J+vmt7kqOB+He/93J+vmt7kqOMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+Pi8MiaOB+Hc/93J+Pi8MiaOB+Hc/93J+Pi8MiaOB+Hc/93J+Pi8MiaOB+He/93J+vi8MiSOB+He/93J+vi8MiSOB+He/93J+vi8MiSOB+He/93J+vi8MiSOMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+Pn+Rf6OB+Hc/93J+Pn+Rf6OB+Hc/93J+Pn+Rf6OB+Hc/93J+Pn+Rf6OB+He/93J+vn+RfyOB+He/93J+vn+RfyOB+He/93J+vn+RfyOB+He/93J+vn+RfyOMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+Hc/93J+PgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACB+He/93J+vgAAAACMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEI+ltY9v/yyJD8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL8/zEK+ltY9P/yyJL+B+Hc/93J+Pr27pSOB+Hc/93J+Pr27pSOB+Hc/93J+Pr27pSOB+Hc/93J+Pr27pSOB+He/93J+vr27paOB+He/93J+vr27paOB+He/93J+vr27paOB+He/93J+vr27paOMsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyO+kYgfPzT8Qz+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q7+MsyM+kYgfvzT8Q78AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAEBAAABAQAAAQEAAAEBAAABAQAAAQEAAAEBAAABAQAAAQEAAAEBAAABAQAAAQEAAAEBAAABAQAAAQEAAAEBAAABAQAAAQEAAAEBAAABAQAAAQEAAAEBAAABAQAAAQEAAAIBAAACAQAAAgEAAAIBAAACAQAAAgEAAAIBAAACAQAAAgEAAAIBAAACAQAAAgEAAAIBAAACAQAAAgEAAAIBAAACAQAAAgEAAAIBAAACAQAAAgEAAAIBAAACAQAAAgEAAAKBAAACgQAAAoEAAAKBAAACgQAAAoEAAAKBAAACgQAAAoEAAAKBAAACgQAAAoEAAAKBAAACgQAAAoEAAAKBAAACgQAAAoEAAAKBAAACgQAAAoEAAAKBAAACgQAAAoEAAAMBAAADAQAAAwEAAAMBAAADAQAAAwEAAAMBAAADAQAAAwEAAAMBAAADAQAAAwEAAAMBAAADAQAAAwEAAAMBAAADAQAAAwEAAAMBAAADAQAAAwEAAAMBAAADAQAAAwEAAAOBAAADgQAAA4EAAAOBAAADgQAAA4EAAAOBAAADgQAAA4EAAAOBAAADgQAAA4EAAAOBAAADgQAAA4EAAAOBAAADgQAAA4EAAAOBAAADgQAAA4EAAAOBAAADgQAAA4EAAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAAABBAAAAQQAAAEEAABBBAAAQQQAAEEEAABBBAAAQQQAAEEEAABBBAAAQQQAAEEEAABBBAAAQQQAAEEEAABBBAAAQQQAAEEEAABBBAAAQQQAAEEEAABBBAAAQQQAAEEEAABBBAAAQQQAAEEEAAAEAAgAAAAIAAwAGAAUABAAHAAYABAAIAAkACgAIAAoACwAOAA0ADAAPAA4ADAASABEAEAATABIAEAAUABUAFgAUABYAFwAYABkAGgAYABoAGwAeAB0AHAAfAB4AHAAgACEAIgAgACIAIwAmACUAJAAnACYAJAAqACkAKAArACoAKAAsAC0ALgAsAC4ALwAwADEAMgAwADIAMwA2ADUANAA3ADYANAA4ADkAOgA4ADoAOwA+AD0APAA/AD4APABCAEEAQABDAEIAQABEAEUARgBEAEYARwBIAEkASgBIAEoASwBOAE0ATABPAE4ATABQAFEAUgBQAFIAUwBWAFUAVABXAFYAVABaAFkAWABbAFoAWABcAF0AXgBcAF4AXwBgAGEAYgBgAGIAYwBmAGUAZABnAGYAZABoAGkAagBoAGoAawBuAG0AbABvAG4AbAByAHEAcABzAHIAcAB0AHUAdgB0AHYAdwB4AHkAegB4AHoAewB+AH0AfAB/AH4AfACAAIEAggCAAIIAgwCGAIUAhACHAIYAhACKAIkAiACLAIoAiACMAI0AjgCMAI4AjwCQAJEAkgCQAJIAkwCWAJUAlACXAJYAlACYAJkAmgCYAJoAmwCeAJ0AnACfAJ4AnACiAKEAoACjAKIAoACkAKUApgCkAKYApwCoAKkAqgCoAKoAqwCuAK0ArACvAK4ArACwALEAsgCwALIAswC2ALUAtAC3ALYAtAC6ALkAuAC7ALoAuAC8AL0AvgC8AL4AvwDAAMEAwgDAAMIAwwDGAMUAxADHAMYAxADIAMkAygDIAMoAywDOAM0AzADPAM4AzADSANEA0ADTANIA0ADUANUA1gDUANYA1wDYANkA2gDYANoA2wDeAN0A3ADfAN4A3ADgAOEA4gDgAOIA4wDmAOUA5ADnAOYA5ADqAOkA6ADrAOoA6ADsAO0A7gDsAO4A7wA="
}
}
}
10 changes: 10 additions & 0 deletions Specs/Scene/Cesium3DTilesetSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ defineSuite([
var tilesetReplacementWithViewerRequestVolumeUrl = 'Data/Cesium3DTiles/Tilesets/TilesetReplacementWithViewerRequestVolume/tileset.json';

var tilesetWithExternalResourcesUrl = 'Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset.json';
var tilesetUrlWithContentUri = 'Data/Cesium3DTiles/Tilesets/TilesetWithContentUri/tileset.json';

var tilesetSubtreeExpirationUrl = 'Data/Cesium3DTiles/Tilesets/TilesetSubtreeExpiration/tileset.json';
var tilesetSubtreeUrl = 'Data/Cesium3DTiles/Tilesets/TilesetSubtreeExpiration/subtree.json';
var batchedExpirationUrl = 'Data/Cesium3DTiles/Batched/BatchedExpiration/tileset.json';
Expand Down Expand Up @@ -2888,6 +2890,14 @@ defineSuite([
});
});

it('supports content data URIs', function() {
return Cesium3DTilesTester.loadTileset(scene, tilesetUrlWithContentUri).then(function(tileset) {
var statistics = tileset._statistics;
expect(statistics.visited).toEqual(1);
expect(statistics.numberOfCommands).toEqual(1);
});
});

it('destroys attached ClippingPlaneCollections and ClippingPlaneCollections that have been detached', function() {
return Cesium3DTilesTester.loadTileset(scene, tilesetUrl).then(function(tileset) {
var clippingPlaneCollection1 = new ClippingPlaneCollection({
Expand Down

0 comments on commit b387130

Please sign in to comment.