Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BLOCKED] feat: use new tiles endpoint #86

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[BLOCKED] feat: use new tiles endpoint #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,33 @@ export enum Color {
OJ_NOT_SIMPSON = '#FF7439',
DARK = '#18141A'
}

export enum AtlasColor {
OWNED = '#3D3A46',
UNOWNED = '#09080A',
PLAZA = '#70AC76',
ROAD = '#716C7A',
DISTRICT = '#5054D4',
ODD = '#110E13',
EVEN = '#0D0B0E'
}

export enum RarityColor {
UNIQUE = '#FFB626',
MYTHIC = '#FF63E1',
LEGENDARY = '#842DDA',
EPIC = '#3D85E6',
RARE = '#36CF75',
UNCOMMON = '#ED6D4F',
COMMON = '#ABC1C1'
}

export enum RarityColorLight {
UNIQUE = '#FFE617',
MYTHIC = '#FB7DE3',
LEGENDARY = '#A657ED',
EPIC = '#6397F2',
RARE = '#3AD682',
UNCOMMON = '#FF8563',
COMMON = '#D4E0E0'
}
74 changes: 41 additions & 33 deletions src/components/Atlas/Atlas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,29 @@ import * as React from 'react'
import { TileMapProps, Layer, TileMap, Coord } from 'react-tile-map'
import 'react-tile-map/lib/styles.css'
import './Atlas.css'
import { AtlasColor } from '../../colors'

export enum AtlasTileType {
OWNED = 'owned',
UNOWNED = 'unowned',
PLAZA = 'plaza',
ROAD = 'road',
DISTRICT = 'district'
}

export type AtlasTile = {
id: string
x: number
y: number
type: number
left?: number
top?: number
topLeft?: number
owner: string
type: AtlasTileType
top: boolean
left: boolean
topLeft: boolean
name?: string
estate_id?: string
owner?: string
estateId?: string
tokenId?: string
price?: number
}

export { Layer, Coord }
Expand All @@ -26,24 +38,6 @@ export type AtlasState = {
tiles?: Record<string, AtlasTile>
}

const COLOR_BY_TYPE = Object.freeze({
0: '#ff9990', // my parcels
1: '#ff4053', // my parcels on sale
2: '#ff9990', // my estates
3: '#ff4053', // my estates on sale
4: '#ffbd33', // parcels/estates where I have permissions
5: '#5054D4', // districts
6: '#563db8', // contributions
7: '#716C7A', // roads
8: '#70AC76', // plazas
9: '#3D3A46', // owned parcel/estate
10: '#3D3A46', // parcels on sale (we show them as owned parcels)
11: '#09080A', // unowned pacel/estate
12: '#18141a', // background
13: '#110e13', // loading odd
14: '#0d0b0e' // loading even
})

export class Atlas extends React.PureComponent<AtlasProps, AtlasState> {
static defaultProps = {
...TileMap.defaultProps,
Expand All @@ -56,25 +50,24 @@ export class Atlas extends React.PureComponent<AtlasProps, AtlasState> {

mounted: boolean = true

layer: Layer = (x, y) => {
const { tiles } = this.state
static getLayer = (tiles: Record<string, AtlasTile>): Layer => (x, y) => {
const id = x + ',' + y
if (tiles && id in tiles) {
const tile = tiles[id]
return {
color: COLOR_BY_TYPE[tile.type],
top: !!tile.top,
left: !!tile.left,
topLeft: !!tile.topLeft
color: Atlas.getColorByType(tile.type),
top: tile.top,
left: tile.left,
topLeft: tile.topLeft
}
} else {
return {
color: (x + y) % 2 === 0 ? COLOR_BY_TYPE[13] : COLOR_BY_TYPE[14]
color: (x + y) % 2 === 0 ? AtlasColor.EVEN : AtlasColor.ODD
}
}
}

static TILES_URL = 'https://api.decentraland.org/v1/tiles'
static TILES_URL = 'https://api.decentraland.org/v2/tiles?exclude=updatedAt'

static fetchTiles = async (url: string = Atlas.TILES_URL) => {
if (!window.fetch) return {}
Expand All @@ -83,6 +76,21 @@ export class Atlas extends React.PureComponent<AtlasProps, AtlasState> {
return json.data as Record<string, AtlasTile>
}

static getColorByType(type: AtlasTileType) {
switch (type) {
case AtlasTileType.OWNED:
return AtlasColor.OWNED
case AtlasTileType.UNOWNED:
return AtlasColor.UNOWNED
case AtlasTileType.PLAZA:
return AtlasColor.PLAZA
case AtlasTileType.ROAD:
return AtlasColor.ROAD
case AtlasTileType.DISTRICT:
return AtlasColor.DISTRICT
}
}

componentDidMount() {
if (!this.state.tiles) {
Atlas.fetchTiles().then(this.handleUpdateTiles)
Expand Down Expand Up @@ -114,7 +122,7 @@ export class Atlas extends React.PureComponent<AtlasProps, AtlasState> {
<TileMap
{...rest}
className={classes.trim()}
layers={[this.layer, ...layers]}
layers={[Atlas.getLayer(this.state.tiles), ...layers]}
/>
)
}
Expand Down